add transitions and cancel/save buttons