Small amendments to admin and menu_select page