modified and added save button