Reorder menu and make some items more clear