Added toggling of POI and GPS position.
Corrected saving GPS-state.