readded navbar and made menubar