Fix save and cancel buttons