Improve top menu