Fixes to top menu