Fix a bunch of template spacing stuff that was bothering me.