Refactor the content block edit forms
Refactor one click transition view