Minor fixes
Save button - updated to do what it actually suppose to do