Refactored navigation top menu. Tests are passed