Changes to Menu UI - exception handling