Improvements to save (and added busy icons)