Fix menus and remove spacer