#79 - Added new UI to edit. Bug fixes.