Add Save & close button to RL
Update to layouts