Refactored top menu into a separate tag