Added SAVE button and few other updates