Template Clean Up

Tabbing, best practices, etc
Merged category template changes