Added main menu
Resolved merge conflict