menu for front page
Resolved conflits