New navbar and cleaning up