restyled main menu
resolved conflict