Remove layer switcher and fix geocoding