Update to templates to match bootstrap standards