top menu refactored