FIxed main menu
Layout improvements