Refactor top menu