Update templates to be consistent with bootstrap