Feature/dynamic menu change