Add main menu interaction
Solve merge conflict