Initial menu stuffs
Resolved conflict