Minor changes in menu
Redesign and a lot fo changes