refactoring content, starting on menu