Prettify and fix menus