Rearrange menu items more logically, and put