Made some changes for menu