Improved top menu