fixing up menu and sidebar stuff