Removed hardcodedmenu structure