Buttons tweaks for back and save