fixed time navigation buttons on map tab displaying wrong
Merge remote-tracking branch 'origin/development' into development