FIX Tidy up controller code so that menu methods always return expected