Feature/menu state implementation

Nitpick: Missing newline at end of file. :)