cms refactoring, menu states etc.