Lots of changes namely to clean up the navigation bar