Merged with latest version. Saving fixed, new UI