save/cancel buttons added, need to discuss cancel