Remove stray closing div tag
Remove old article template and replace with v2 version
Fix errors after rebase