moved nav bar, added map