Ticket #984: Refactoring top menu