Issue #853 - Refactor top menu