Added state management and the empty main menu state
Merge branch 'develop'