Move layer config into a separate file. Add a Mapzen vector tile layer. Make the overlay layers toggleable.
Oliver Jowett