fixing few bugs related to new user flow and save delete btns