Cleaned up bootstrap classes a bit on templates