Remove additional menu and place sort options in spinner