starting to fix navbar and sidebar