Final fixes on save part of app