Improve ui for save/save as action
Merge remote-tracking branch 'upstream/master'