Added separate menu controller