Issue #853 - Refactor top menu - solution 2