Stylistic tweaks, renamed 'cancelled' forms to 'deleted'