layout updates in my views that hadn't kept in step with changes to ffcrm/master