Feature/menu state implementation