Some more menu improvements