Make templating cleaner
Fix some minor markup errors