More refactoring of the title menu