new layout on 'Create' view
Fix conflicts with Chris