Added new switch for buoys

Also fixed problem of markers disappearing when switching tabs. Still
need to make the switch work right