Added changes for menu working