Changed order of menu items and added dividers.