Updated code for menu and configration