Improve menu design