Cleanup
Added user marker
Changed Navbar
In the middle of implementing search