Updated all templates and experimented with bootstrap classes