bugfixes with new buttons 'Cancel' and 'Switch to markup'
bugfixes with new buttons 'Cancel' and 'Switch to markup'

perfwatcher/perfwatcher,perfwatcher/perfwatcher,perfwatcher/perfwatcher,perfwatcher/perfwatcher