Improved MenuController