Fixed menus a bit