Add Save & Back -buttons, minor UI tweaks