Menu changes

Setting up menus