more menu improvements
more menu improvement