Improved rectangle editing
Save and Cancel doctype changes