Get tests green again
Add cancel link to unpublish form