Fixing up the top menu a bit