Fix issues with menus
Update styling