fixed hiding and showing of buttons
WIP: canceling of changes