convert new movement pg to haml; change draft wording