Refactoring, menu screen