re-arranged navigation bar/redesigned map page