Changed structure of menu controller