Rebuilt menus, added icons.