Updating templates for Bootstrap 3.x changes and some custom oa specific classes