Updated the roles more consistently but think we might want to find a way to make these changes a bit more elegantly
Bootstrap isn't quite on parody with a11y classes, will revert to Drupal defaults until then