Some UI experiments. Added a menu item.
Conflict fixed.