Addded saving, fixed buttons still disabled