Navbar bugfixing
merge navbar and actionbar changes