Added MenuState
Added state handling
merge dev_NL into dev