diff --git a/Gruntfile.js b/Gruntfile.js
index 98d0b6ad63..6184ea2896 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -39,6 +39,9 @@ module.exports = function(grunt) {
             },
             dist_progress: {
                 src: [
+                    'public/javascripts/Admin/src/*.js',
+                    'public/javascripts/SVValidate/src/util/*.js',
+                    'public/javascripts/common/Panomarker.js',
                     'public/javascripts/Progress/src/*.js',
                     'public/javascripts/common/Utilities.js',
                     'public/javascripts/common/UtilitiesSidewalk.js',
diff --git a/app/controllers/AdminController.scala b/app/controllers/AdminController.scala
index 8c77f3d416..1acc03dd09 100644
--- a/app/controllers/AdminController.scala
+++ b/app/controllers/AdminController.scala
@@ -14,10 +14,13 @@ import formats.json.LabelFormat
 import formats.json.TaskFormats._
 import formats.json.AdminUpdateSubmissionFormats._
 import formats.json.LabelFormat._
+import formats.json.OrganizationFormats._
+import formats.json.UserFormats._
 import javassist.NotFoundException
 import models.attribute.{GlobalAttribute, GlobalAttributeTable}
 import models.audit.{AuditTaskInteractionTable, AuditTaskTable, AuditedStreetWithTimestamp, InteractionWithLabel}
 import models.daos.slick.DBTableDefinitions.UserTable
+import models.daos.slick._
 import models.gsv.{GSVDataSlim, GSVDataTable}
 import models.label.LabelTable.{AdminValidationData, LabelMetadata}
 import models.label.{LabelLocationWithSeverity, LabelPointTable, LabelTable, LabelTypeTable, LabelValidationTable}
@@ -275,7 +278,9 @@ class AdminController @Inject() (implicit val env: Environment[User, SessionAuth
               "audit_task_id" -> label.auditTaskId,
               "label_id" -> label.labelId,
               "gsv_panorama_id" -> label.gsvPanoramaId,
-              "label_type" -> label.labelType
+              "label_type" -> label.labelType,
+              "correct" -> label.correct,
+              "has_validations" -> label.hasValidations
             )
             Json.obj("type" -> "Feature", "geometry" -> point, "properties" -> properties)
           }
@@ -570,17 +575,16 @@ class AdminController @Inject() (implicit val env: Environment[User, SessionAuth
         val newOrgId: Int = submission.orgId
 
         if (isAdmin(request.identity)) {
-          // Remove any previous org and add the new org. Will add the ability to be in multiple orgs in the future.
-          val currentOrg: Option[Int] = UserOrgTable.getAllOrgs(userId).headOption
+          val currentOrg: Option[Int] = UserOrgTable.getOrg(userId)
           if (currentOrg.nonEmpty) {
             UserOrgTable.remove(userId, currentOrg.get)
           }
           val rowsUpdated: Int = UserOrgTable.save(userId, newOrgId)
 
-          if (rowsUpdated > 0) {
-            Future.successful(Ok(Json.obj("user_id" -> userId, "org_id" -> newOrgId)))
+          if (rowsUpdated == -1 && currentOrg.isEmpty) {
+            Future.successful(BadRequest("Update failed"))
           } else {
-            Future.successful(BadRequest("Error saving org"))
+            Future.successful(Ok(Json.obj("user_id" -> userId, "org_id" -> newOrgId)))
           }
         } else {
           Future.failed(new AuthenticationException("User is not an administrator"))
@@ -740,4 +744,19 @@ class AdminController @Inject() (implicit val env: Environment[User, SessionAuth
     )
     Future.successful(Ok(data))
   }
+
+  /**
+   * Get the stats for the users table in the admin page.
+   */
+  def getUserStats = UserAwareAction.async { implicit request =>
+    if (isAdmin(request.identity)) {
+      val data = Json.obj(
+        "user_stats" -> Json.toJson(UserDAOSlick.getUserStatsForAdminPage),
+        "organizations" -> Json.toJson(OrganizationTable.getAllOrganizations)
+      )
+      Future.successful(Ok(data))
+    } else {
+      Future.failed(new AuthenticationException("User is not an administrator"))
+    }
+  }
 }
diff --git a/app/controllers/CredentialsAuthController.scala b/app/controllers/CredentialsAuthController.scala
index 00a09ca8f9..d55806678f 100644
--- a/app/controllers/CredentialsAuthController.scala
+++ b/app/controllers/CredentialsAuthController.scala
@@ -92,6 +92,8 @@ class CredentialsAuthController @Inject() (
     val expirationDate = authenticator.expirationDate.minusSeconds(defaultExpiry).plusSeconds(rememberMeExpiry)
     val updatedAuthenticator = authenticator.copy(expirationDate=expirationDate, idleTimeout = Some(2592000))
 
+    // Add to user_stat or user_current_region if user hasn't logged in in this city before.
+    UserStatTable.addUserStatIfNew(user.userId)
     if (!UserCurrentRegionTable.isAssigned(user.userId)) {
       UserCurrentRegionTable.assignRegion(user.userId)
     }
diff --git a/app/controllers/SignUpController.scala b/app/controllers/SignUpController.scala
index 1fbe67a84b..5ad66eaa06 100644
--- a/app/controllers/SignUpController.scala
+++ b/app/controllers/SignUpController.scala
@@ -75,14 +75,12 @@ class SignUpController @Inject() (
           UserTable.find(data.username) match {
             case Some(user) =>
               WebpageActivityTable.save(WebpageActivity(0, oldUserId, ipAddress, "Duplicate_Username_Error", timestamp))
-  //            Future.successful(Redirect(routes.UserController.signUp()).flashing("error" -> Messages("authenticate.error.username.exists")))
               Future.successful(Status(409)(Messages("authenticate.error.username.exists")))
             case None =>
               // Check presence of user by email.
               UserTable.findEmail(data.email.toLowerCase) match {
                 case Some(user) =>
                   WebpageActivityTable.save(WebpageActivity(0, oldUserId, ipAddress, "Duplicate_Email_Error", timestamp))
-  //                Future.successful(Redirect(routes.UserController.signUp()).flashing("error" -> Messages("authenticate.error.email.exists")))
                   Future.successful(Status(409)(Messages("authenticate.error.email.exists")))
                 case None =>
                   // Check if passwords match and are at least 6 characters.
@@ -107,8 +105,8 @@ class SignUpController @Inject() (
                     } yield {
                       // Set the user role, assign the neighborhood to audit, and add to the user_stat table.
                       UserRoleTable.setRole(user.userId, "Registered", Some(serviceHoursUser))
-                      UserCurrentRegionTable.assignRegion(user.userId)
                       UserStatTable.addUserStatIfNew(user.userId)
+                      UserCurrentRegionTable.assignRegion(user.userId)
 
                       // Log the sign up/in.
                       val timestamp: Timestamp = new Timestamp(Instant.now.toEpochMilli)
@@ -124,9 +122,9 @@ class SignUpController @Inject() (
                         // If someone was already authenticated (i.e., they were signed into an anon user account), Play
                         // doesn't let us sign one account out and the other back in in one response header. So we start
                         // by redirecting to the "/finishSignUp" endpoint, discarding the old authenticator info and
-                        // sending the new authenticator info in a temp element in the session cookie. The "/finishSignUp"
-                        // endpoint will then move authenticator we put in "temp-authenticator" over to "authenticator"
-                        // where it belongs, finally completing the sign up.
+                        // sending the new authenticator info in a temp element in the session cookie. The
+                        // "/finishSignUp" endpoint will then move authenticator we put in "temp-authenticator" over to
+                        // "authenticator" where it belongs, finally completing the sign up.
                         val redirectURL: String = nextUrl match {
                           case Some(u) => "/finishSignUp?url=" + u
                           case None => "/finishSignUp"
@@ -236,6 +234,7 @@ class SignUpController @Inject() (
           // Set the user role and add to the user_stat table.
           UserRoleTable.setRole(user.userId, "Anonymous", Some(false))
           UserStatTable.addUserStatIfNew(user.userId)
+          UserCurrentRegionTable.assignRegion(user.userId)
 
           // Add Timestamp
           val timestamp: Timestamp = new Timestamp(Instant.now.toEpochMilli)
@@ -303,8 +302,8 @@ class SignUpController @Inject() (
         } yield {
           // Set the user role, assign the neighborhood to audit, and add to the user_stat table.
           UserRoleTable.setRole(user.userId, "Turker", Some(false))
-          UserCurrentRegionTable.assignRegion(user.userId)
           UserStatTable.addUserStatIfNew(user.userId)
+          UserCurrentRegionTable.assignRegion(user.userId)
 
           // Log the sign up/in.
           val timestamp: Timestamp = new Timestamp(Instant.now.toEpochMilli)
diff --git a/app/controllers/TaskController.scala b/app/controllers/TaskController.scala
index 68d5778dfe..3ee09c6b05 100644
--- a/app/controllers/TaskController.scala
+++ b/app/controllers/TaskController.scala
@@ -21,12 +21,13 @@ import models.region._
 import models.route.{AuditTaskUserRouteTable, UserRouteTable}
 import models.street.StreetEdgePriorityTable.streetPrioritiesFromIds
 import models.street.{StreetEdgeIssue, StreetEdgeIssueTable, StreetEdgePriority, StreetEdgePriorityTable}
-import models.user.{User, UserCurrentRegionTable}
+import models.user.{User, UserCurrentRegionTable, UserStatTable}
 import models.utils.CommonUtils.ordered
 import play.api.Play.current
 import play.api.{Logger, Play}
 import play.api.libs.json._
 import play.api.mvc._
+
 import scala.collection.mutable.ListBuffer
 //import scala.concurrent.{ExecutionContext, Future}
 import scala.concurrent.Future
@@ -229,18 +230,13 @@ class TaskController @Inject() (implicit val env: Environment[User, SessionAuthe
           if (!AuditTaskTable.userHasAuditedStreet(streetEdgeId, user.userId)) {
             data.auditTask.completed.map { completed =>
               if (completed) {
-                StreetEdgePriorityTable.partiallyUpdatePriority(streetEdgeId, Some(user.userId.toString))
+                StreetEdgePriorityTable.partiallyUpdatePriority(streetEdgeId, user.userId)
               }
             }
           }
         case None =>
           // Update the street's priority for anonymous user.
           Logger.warn("User without user_id audited a street, but every user should have a user_id.")
-          data.auditTask.completed.map { completed =>
-            if (completed) {
-              StreetEdgePriorityTable.partiallyUpdatePriority(streetEdgeId, None)
-            }
-          }
       }
       // If street priority went from 1 to < 1 due to this audit, update the region_completion table accordingly.
       val priorityAfter: StreetEdgePriority = streetPrioritiesFromIds(List(streetEdgeId)).head
@@ -315,8 +311,9 @@ class TaskController @Inject() (implicit val env: Environment[User, SessionAuthe
             _streetId <- LabelTable.getStreetEdgeIdClosestToLatLng(_lat, _lng)
           } yield _streetId).getOrElse(streetEdgeId)
 
-          // Add the new entry to the label table.
+          // Add the new entry to the label table. Make sure there's also an entry in the user_stat table.
           val u: String = userOption.map(_.userId.toString).getOrElse(UserTable.find("anonymous").get.userId)
+          UserStatTable.addUserStatIfNew(UUID.fromString(u))
           val newLabelId: Int = LabelTable.save(Label(0, auditTaskId, missionId, u, label.gsvPanoramaId, labelTypeId,
             label.deleted, label.temporaryLabelId, timeCreated, label.tutorial, calculatedStreetEdgeId, 0, 0, 0, None,
             label.severity, label.temporary, label.description, label.tagIds.distinct.flatMap(t => TagTable.selectAllTags.filter(_.tagId == t).map(_.tag).headOption).toList))
diff --git a/app/controllers/UserProfileController.scala b/app/controllers/UserProfileController.scala
index c37b5961f8..5fc788b510 100644
--- a/app/controllers/UserProfileController.scala
+++ b/app/controllers/UserProfileController.scala
@@ -19,6 +19,8 @@ import play.api.libs.json.{JsObject, JsValue, Json}
 import play.extras.geojson
 import play.api.i18n.Messages
 import scala.concurrent.Future
+import play.api.mvc._
+import models.user.OrganizationTable
 
 /**
  * Holds the HTTP requests associated with the user dashboard.
@@ -111,7 +113,9 @@ class UserProfileController @Inject() (implicit val env: Environment[User, Sessi
             "audit_task_id" -> label.auditTaskId,
             "label_id" -> label.labelId,
             "gsv_panorama_id" -> label.gsvPanoramaId,
-            "label_type" -> label.labelType
+            "label_type" -> label.labelType,
+            "correct" -> label.correct,
+            "has_validations" -> label.hasValidations
           )
           Json.obj("type" -> "Feature", "geometry" -> point, "properties" -> properties)
         }
@@ -183,11 +187,11 @@ class UserProfileController @Inject() (implicit val env: Environment[User, Sessi
       case Some(user) =>
         val userId: UUID = user.userId
         if (user.role.getOrElse("") != "Anonymous") {
-          val allUserOrgs: List[Int] = UserOrgTable.getAllOrgs(userId)
-          if (allUserOrgs.headOption.isEmpty) {
+          val userOrg: Option[Int] = UserOrgTable.getOrg(userId)
+          if (userOrg.isEmpty) {
             UserOrgTable.save(userId, orgId)
-          } else if (allUserOrgs.head != orgId) {
-            UserOrgTable.remove(userId, allUserOrgs.head)
+          } else if (userOrg.get != orgId) {
+            UserOrgTable.remove(userId, userOrg.get)
             UserOrgTable.save(userId, orgId)
           }
         }
@@ -197,6 +201,23 @@ class UserProfileController @Inject() (implicit val env: Environment[User, Sessi
     }
   }
 
+  /**
+   * Creates a team and puts them in the organization table.
+   */
+  def createTeam() = Action(parse.json) { request =>
+  val orgName: String = (request.body \ "name").as[String]
+  val orgDescription: String = (request.body \ "description").as[String]
+
+  // Inserting into the database and capturing the generated orgId.
+  val orgId: Int = OrganizationTable.insert(orgName, orgDescription)
+
+  Ok(Json.obj(
+    "message" -> "Organization created successfully!",
+    "org_id" -> orgId 
+  ))
+}
+
+
   /**
    * Gets some basic stats about the logged in user that we show across the site: distance, label count, and accuracy.
    */
diff --git a/app/controllers/ValidationTaskController.scala b/app/controllers/ValidationTaskController.scala
index 005213b3ee..56f465bd78 100644
--- a/app/controllers/ValidationTaskController.scala
+++ b/app/controllers/ValidationTaskController.scala
@@ -212,7 +212,7 @@ class ValidationTaskController @Inject() (implicit val env: Environment[User, Se
           MissionTable.resumeOrCreateNewValidationMission(userId, 0.0D, 0.0D, "labelmapValidation", labelTypeId).get
 
         // Check if user already has a validation for this label.
-        if(LabelValidationTable.countValidationsFromUserAndLabel(userId, submission.labelId) != 0) {
+        if (LabelValidationTable.countValidationsFromUserAndLabel(userId, submission.labelId) != 0) {
           // Delete the user's old label.
           LabelValidationTable.deleteLabelValidation(submission.labelId, userId.toString)
         }
diff --git a/app/formats/json/OrganizationFormats.scala b/app/formats/json/OrganizationFormats.scala
new file mode 100644
index 0000000000..6e10120f25
--- /dev/null
+++ b/app/formats/json/OrganizationFormats.scala
@@ -0,0 +1,14 @@
+package formats.json
+
+import models.user._
+import play.api.libs.json._
+import play.api.libs.functional.syntax._
+
+// https://github.com/datalek/silhouette-rest-seed/blob/master/app/formatters/json/UserFormats.scala
+object OrganizationFormats {
+  implicit val organizationWrites: Writes[Organization] = (
+    (JsPath \ "orgId").write[Int] and
+      (JsPath \ "orgName").write[String] and
+      (JsPath \ "orgDescription").write[String]
+    )(unlift(Organization.unapply _))
+}
diff --git a/app/formats/json/UserFormats.scala b/app/formats/json/UserFormats.scala
index da3ca4ef31..df973e7372 100644
--- a/app/formats/json/UserFormats.scala
+++ b/app/formats/json/UserFormats.scala
@@ -1,7 +1,9 @@
 package formats.json
 
+import java.sql.Timestamp
 import java.util.UUID
 
+import models.daos.slick.UserStatsForAdminPage
 import models.user._
 import play.api.libs.json._
 import play.api.libs.functional.syntax._
@@ -31,4 +33,21 @@ object UserFormats {
       (__ \ "validated_incorrect").write[Int] and
       (__ \ "not_validated").write[Int]
   )(unlift(LabelTypeStat.unapply _))
+
+  implicit val userStatsWrites: Writes[UserStatsForAdminPage] = (
+    (__ \ "userId").write[String] and
+      (__ \ "username").write[String] and
+      (__ \ "email").write[String] and
+      (__ \ "role").write[String] and
+      (__ \ "org").writeNullable[String] and
+      (__ \ "signUpTime").writeNullable[Timestamp] and
+      (__ \ "lastSignInTime").writeNullable[Timestamp] and
+      (__ \ "signInCount").write[Int] and
+      (__ \ "labels").write[Int] and
+      (__ \ "ownValidated").write[Int] and
+      (__ \ "ownValidatedAgreedPct").write[Double] and
+      (__ \ "othersValidated").write[Int] and
+      (__ \ "othersValidatedAgreedPct").write[Double] and
+      (__ \ "highQuality").write[Boolean]
+  )(unlift(UserStatsForAdminPage.unapply _))
 }
diff --git a/app/models/daos/slick/UserDAOSlick.scala b/app/models/daos/slick/UserDAOSlick.scala
index a7e7a666ac..0036101e08 100644
--- a/app/models/daos/slick/UserDAOSlick.scala
+++ b/app/models/daos/slick/UserDAOSlick.scala
@@ -13,7 +13,6 @@ import models.user.OrganizationTable.organizations
 import models.user.UserOrgTable.userOrgs
 import models.user.{RoleTable, UserStatTable, WebpageActivityTable}
 import models.user.{User, UserRoleTable}
-import models.label.{LabelValidation, LabelValidationTable}
 import play.api.db.slick._
 import play.api.db.slick.Config.driver.simple._
 import play.api.Play.current
@@ -503,12 +502,12 @@ object UserDAOSlick {
 
     // Map(user_id: String -> (role: String, total: Int, agreed: Int, disagreed: Int, unsure: Int)).
     val validatedCounts = LabelValidationTable.getValidationCountsPerUser.map { valCount =>
-      (valCount._1, (valCount._2, valCount._3, valCount._4, valCount._5, valCount._6))
+      (valCount._1, (valCount._2, valCount._3, valCount._4))
     }.toMap
 
     // Map(user_id: String -> (count: Int, agreed: Int, disagreed: Int)).
     val othersValidatedCounts = LabelValidationTable.getValidatedCountsPerUser.map { valCount =>
-      (valCount._1, (valCount._2, valCount._3, valCount._4))
+      (valCount._1, (valCount._2, valCount._3))
     }.toMap
 
     val userHighQuality =
@@ -516,23 +515,21 @@ object UserDAOSlick {
 
     // Now left join them all together and put into UserStatsForAdminPage objects.
     usersMinusAnonUsersWithNoLabelsAndNoValidations.list.map { u =>
-      val ownValidatedCounts = validatedCounts.getOrElse(u.userId, ("", 0, 0, 0, 0))
+      val ownValidatedCounts = validatedCounts.getOrElse(u.userId, ("", 0, 0))
       val ownValidatedTotal = ownValidatedCounts._2
       val ownValidatedAgreed = ownValidatedCounts._3
-      val ownValidatedDisagreed = ownValidatedCounts._4
 
-      val otherValidatedCounts = othersValidatedCounts.getOrElse(u.userId, (0, 0, 0))
+      val otherValidatedCounts = othersValidatedCounts.getOrElse(u.userId, (0, 0))
       val otherValidatedTotal = otherValidatedCounts._1
       val otherValidatedAgreed = otherValidatedCounts._2
-      val otherValidatedDisagreed = otherValidatedCounts._3
 
       val ownValidatedAgreedPct =
         if (ownValidatedTotal == 0) 0f
-        else ownValidatedAgreed * 1.0 / (ownValidatedAgreed + ownValidatedDisagreed)
+        else ownValidatedAgreed * 1.0 / ownValidatedTotal
 
       val otherValidatedAgreedPct =
         if (otherValidatedTotal == 0) 0f
-        else otherValidatedAgreed * 1.0 / (otherValidatedAgreed + otherValidatedDisagreed)
+        else otherValidatedAgreed * 1.0 / otherValidatedTotal
 
       UserStatsForAdminPage(
         u.userId, u.username, u.email,
diff --git a/app/models/label/LabelTable.scala b/app/models/label/LabelTable.scala
index e4466c7fb4..286fb3fcf5 100644
--- a/app/models/label/LabelTable.scala
+++ b/app/models/label/LabelTable.scala
@@ -40,7 +40,7 @@ case class POV(heading: Double, pitch: Double, zoom: Int)
 case class Dimensions(width: Int, height: Int)
 case class LocationXY(x: Int, y: Int)
 
-case class LabelLocation(labelId: Int, auditTaskId: Int, gsvPanoramaId: String, labelType: String, lat: Float, lng: Float)
+case class LabelLocation(labelId: Int, auditTaskId: Int, gsvPanoramaId: String, labelType: String, lat: Float, lng: Float, correct: Option[Boolean], hasValidations: Boolean)
 
 case class LabelLocationWithSeverity(labelId: Int, auditTaskId: Int, labelType: String, lat: Float, lng: Float,
                                      correct: Option[Boolean], hasValidations: Boolean, expired: Boolean,
@@ -250,7 +250,7 @@ object LabelTable {
   ))
 
   implicit val labelLocationConverter = GetResult[LabelLocation](r =>
-    LabelLocation(r.nextInt, r.nextInt, r.nextString, r.nextString, r.nextFloat, r.nextFloat))
+    LabelLocation(r.nextInt, r.nextInt, r.nextString, r.nextString, r.nextFloat, r.nextFloat, r.nextBooleanOption, r.nextBoolean))
 
   implicit val labelSeverityConverter = GetResult[LabelLocationWithSeverity](r =>
     LabelLocationWithSeverity(r.nextInt, r.nextInt, r.nextString, r.nextFloat, r.nextFloat, r.nextBooleanOption,
@@ -601,6 +601,9 @@ object LabelTable {
     val userIdString: String = userId.toString
     val labelsValidatedByUser = labelValidations.filter(_.userId === userIdString)
 
+    // Make sure there is a user_stat entry for the given user.
+    UserStatTable.addUserStatIfNew(userId)
+
     // Get labels the given user has not placed that have non-expired GSV imagery.
     val labelsToValidate =  for {
       _lb <- labels
@@ -1038,8 +1041,12 @@ object LabelTable {
       if _l.userId === userId.toString
       if regionId.isEmpty.asColumnOf[Boolean] || _ser.regionId === regionId.getOrElse(-1)
       if _lp.lat.isDefined && _lp.lng.isDefined
-    } yield (_l.labelId, _l.auditTaskId, _l.gsvPanoramaId, _lt.labelType, _lp.lat.get, _lp.lng.get)
-    _labels.list.map(LabelLocation.tupled)
+    } yield (_l.labelId, _l.auditTaskId, _l.gsvPanoramaId, _lt.labelType, _lp.lat, _lp.lng, _l.correct, _l.agreeCount > 0 || _l.disagreeCount > 0 || _l.unsureCount > 0)
+
+    // For some reason we couldn't use both `_l.agreeCount > 0` and `_lPoint.lat.get` in the yield without a runtime
+    // error, which is why we couldn't use `.tupled` here. This was the error message:
+    // SlickException: Expected an option type, found Float/REAL
+    _labels.list.map(l => LabelLocation(l._1, l._2, l._3, l._4, l._5.get, l._6.get, l._7, l._8))
   }
 
   /**
diff --git a/app/models/label/LabelValidationTable.scala b/app/models/label/LabelValidationTable.scala
index 69950e7b8c..1ec6b6c91c 100644
--- a/app/models/label/LabelValidationTable.scala
+++ b/app/models/label/LabelValidationTable.scala
@@ -148,6 +148,7 @@ object LabelValidationTable {
    * @return The label_validation_id of the inserted/updated validation.
    */
   def insert(labelVal: LabelValidation): Int = db.withTransaction { implicit session =>
+    UserStatTable.addUserStatIfNew(UUID.fromString(labelVal.userId))
     val isExcludedUser: Boolean = UserStatTable.userStats.filter(_.userId === labelVal.userId).map(_.excluded).first
     val userThatAppliedLabel: String = labelsUnfiltered.filter(_.labelId === labelVal.labelId).map(_.userId).list.head
 
@@ -250,25 +251,23 @@ object LabelValidationTable {
   /**
     * Select validation counts per user.
     *
-    * @return list of tuples (labeler_id, labeler_role, labels_validated, agreed_count, disagreed_count, unsure_count)
+    * @return list of tuples (labeler_id, labeler_role, labels_validated, agreed_count)
     */
-  def getValidationCountsPerUser: List[(String, String, Int, Int, Int, Int)] = db.withSession { implicit session =>
+  def getValidationCountsPerUser: List[(String, String, Int, Int)] = db.withSession { implicit session =>
     val _labels = for {
       _label <- LabelTable.labelsWithExcludedUsers
-      _user <- users if _user.username =!= "anonymous" && _user.userId === _label.userId // User who placed the label
+      _user <- users if _user.username =!= "anonymous" && _user.userId === _label.userId // User who placed the label.
       _userRole <- userRoles if _user.userId === _userRole.userId
       _role <- roleTable if _userRole.roleId === _role.roleId
-      if _label.agreeCount > 0 || _label.disagreeCount > 0 || _label.unsureCount > 0 // Filter for labels w/ validation
+      if _label.correct.isDefined // Filter for labels marked as either correct or incorrect.
     } yield (_user.userId, _role.role, _label.correct)
 
-    // Count the number of correct/incorrect/unsure labels for each user.
+    // Count the number of correct labels and total number marked as either correct or incorrect for each user.
     _labels.groupBy(l => (l._1, l._2)).map { case ((userId, role), group) => (
       userId,
       role,
-      group.length,
-      group.map(l => Case.If(l._3.getOrElse(false) === true).Then(1).Else(0)).sum.getOrElse(0), // # correct labels
-      group.map(l => Case.If(l._3.getOrElse(true) === false).Then(1).Else(0)).sum.getOrElse(0), // # incorrect labels
-      group.map(l => Case.If(l._3.isEmpty).Then(1).Else(0)).sum.getOrElse(0)                    // # unsure labels
+      group.length, // # Correct or incorrect.
+      group.map(l => Case.If(l._3.getOrElse(false) === true).Then(1).Else(0)).sum.getOrElse(0) // # Correct labels.
     )}.list
   }
 
@@ -277,27 +276,21 @@ object LabelValidationTable {
     *
     * @return list of tuples of (labeler_id, validation_count, validation_agreed_count, validation_disagreed_count)
     */
-  def getValidatedCountsPerUser: List[(String, Int, Int, Int)] = db.withSession { implicit session =>
+  def getValidatedCountsPerUser: List[(String, Int, Int)] = db.withSession { implicit session =>
     val validations = for {
       _validation <- validationLabels
       _validationUser <- users if _validationUser.userId === _validation.userId
       _userRole <- userRoles if _validationUser.userId === _userRole.userId
       if _validationUser.username =!= "anonymous"
+      if _validation.labelValidationId =!= 3 // Exclude "unsure" validations.
     } yield (_validationUser.userId, _validation.validationResult)
 
     // Counts the number of labels for each user by grouping by user_id and role.
     validations.groupBy(l => l._1).map {
       case (uId, group) => {
-        // Sum up the agreed/disagreed results
-        val agreed = group.map { r =>
-          Case.If(r._2 === 1).Then(1).Else(0) // Only count it if the result was "agree"
-        }.sum.getOrElse(0)
-        val disagreed = group.map { r =>
-          Case.If(r._2 === 2).Then(1).Else(0) // Only count it if the result was "disagree"
-        }.sum.getOrElse(0)
-
-        // group.length is the total # of validations
-        (uId, group.length, agreed, disagreed)
+        // Sum up the agreed validations and total validations (just agreed + disagreed).
+        val agreed = group.map { r => Case.If(r._2 === 1).Then(1).Else(0) }.sum.getOrElse(0)
+        (uId, group.length, agreed)
       }
     }.list
   }
diff --git a/app/models/street/StreetEdgePriorityTable.scala b/app/models/street/StreetEdgePriorityTable.scala
index aa94de496f..fa3fc15128 100644
--- a/app/models/street/StreetEdgePriorityTable.scala
+++ b/app/models/street/StreetEdgePriorityTable.scala
@@ -6,6 +6,8 @@ import models.utils.MyPostgresDriver.simple._
 import play.api.Play.current
 import play.api.cache.Cache
 import play.api.libs.json._
+
+import java.util.UUID
 import scala.concurrent.duration.DurationInt
 import scala.slick.lifted.ForeignKeyQuery
 import scala.slick.jdbc.GetResult
@@ -253,11 +255,10 @@ object StreetEdgePriorityTable {
     * @param streetEdgeId
     * @return success boolean
     */
-  def partiallyUpdatePriority(streetEdgeId: Int, userId: Option[String]): Boolean = db.withTransaction { implicit session =>
-    // Check if the user that audited is high quality. If we don't have their user_id, assume high quality for now.
-    val userHighQuality: Boolean = userId.flatMap {
-      u => UserStatTable.userStats.filter(_.userId === u).map(_.highQuality).list.headOption
-    }.getOrElse(true)
+  def partiallyUpdatePriority(streetEdgeId: Int, userId: UUID): Boolean = db.withTransaction { implicit session =>
+    // Check if the user that audited is high quality. Make sure they have an entry in user_stat table first.
+    UserStatTable.addUserStatIfNew(userId)
+    val userHighQuality: Boolean = UserStatTable.userStats.filter(_.userId === userId.toString).map(_.highQuality).first
 
     val priorityQuery = for { edge <- streetEdgePriorities if edge.streetEdgeId === streetEdgeId } yield edge.priority
     val rowsWereUpdated: Option[Boolean] = priorityQuery.run.headOption.map { currPriority =>
diff --git a/app/models/user/OrganizationTable.scala b/app/models/user/OrganizationTable.scala
index 8bf9123cb8..e9af3841af 100644
--- a/app/models/user/OrganizationTable.scala
+++ b/app/models/user/OrganizationTable.scala
@@ -58,4 +58,16 @@ object OrganizationTable {
   def getOrganizationDescription(orgId: Int): Option[String] = db.withTransaction { implicit session =>
     organizations.filter(_.orgId === orgId).map(_.orgDescription).firstOption
   }
+  
+  /**
+  * Inserts a new organization into the database.
+  *
+  * @param orgName The name of the organization to be created.
+  * @param orgDescription A brief description of the organization.
+  * @return The auto-generated ID of the newly created organization.
+  */
+  def insert(orgName: String, orgDescription: String): Int = db.withSession { implicit session =>
+    val newOrganization = Organization(0, orgName, orgDescription) // orgId is auto-generated.
+    (organizations returning organizations.map(_.orgId)) += newOrganization
+  }
 }
diff --git a/app/models/user/UserOrgTable.scala b/app/models/user/UserOrgTable.scala
index fafc5b584e..147dcdae0f 100644
--- a/app/models/user/UserOrgTable.scala
+++ b/app/models/user/UserOrgTable.scala
@@ -22,13 +22,13 @@ object UserOrgTable {
   val userOrgs = TableQuery[UserOrgTable]
 
   /**
-   * Gets all organizations the given user is affiliated with.
+   * Gets the organization the given user is affiliated with.
    *
    * @param userId The id of the user.
-   * @return A list of all organizations the given user is affiliated with.
+   * @return The organization the given user is affiliated with.
    */
-  def getAllOrgs(userId: UUID): List[Int] = db.withSession { implicit session =>
-    userOrgs.filter(_.userId === userId.toString).map(_.orgId).list
+  def getOrg(userId: UUID): Option[Int] = db.withSession { implicit session =>
+    userOrgs.filter(_.userId === userId.toString).map(_.orgId).firstOption
   }
 
   /**
diff --git a/app/views/admin/index.scala.html b/app/views/admin/index.scala.html
index bb875795ec..d12ad26609 100644
--- a/app/views/admin/index.scala.html
+++ b/app/views/admin/index.scala.html
@@ -5,25 +5,16 @@
 @import models.audit.AuditTaskCommentTable
 @import models.utils.DataFormatter
 
-@import models.user.OrganizationTable
 @(title: String, user: Option[User] = None)(implicit lang: Lang)
 @main(title) {
     @navbar(user, Some("/admin"))
-    <style>
-        .no-js #loader { display: none;  }
-        .js #loader { display: block; position: absolute; left: 100px; top: 0; }
-        .loader {
-            position: fixed;
-            left: 0px;
-            top: 0px;
-            width: 100%;
-            height: 100%;
-            z-index: 9999;
-            background: url('/assets/images/project_sidewalk_page_load.gif') center no-repeat #fff ;
-        }
-    </style>
-    <div class="loader"></div>
-    <div class="container">
+    <div id="page-loading">
+        <div id="loading-gif">
+            <p class="loading-text">@Messages("loading")</p>
+            <img src='@routes.Assets.at("images/project_sidewalk_page_load.gif")' title='@Messages("loading")'/>
+        </div>
+    </div>
+    <div id="admin-page-container" class="container" style="visibility: hidden">
         <div id="row">
             <div class="col-lg-2">
             <ul class="nav nav-pills nav-stacked">
@@ -816,56 +807,7 @@ <h1>Users</h1>
                                         <th class="col-md-1">Login Count</th>
                                     </tr>
                                 </thead>
-                                <tbody>
-                                @UserDAOSlick.getUserStatsForAdminPage.map { u =>
-                                <tr>
-                                    <td><a href='@routes.AdminController.userProfile(u.username)'>@u.username</a></td>
-                                    <td>@u.userId</td>
-                                    <td>@u.email</td>
-                                    <td>
-                                        @if(u.role != "Owner"){
-                                            <div class="dropdown role-dropdown">
-                                                <button class="btn btn-default dropdown-toggle" type="button" id="userRoleDropdown@u.userId" data-toggle="dropdown">
-                                                    @u.role
-                                                    <span class="caret"></span>
-                                                </button>
-                                                <ul class="dropdown-menu" role="menu" aria-labelledby="userRoleDropdown@u.userId">
-                                                    <li role="presentation"><a role="menuitem" tabindex="-1" href="#!" class="change-role">Registered</a></li>
-                                                    <li role="presentation"><a role="menuitem" tabindex="-1" href="#!" class="change-role">Turker</a></li>
-                                                    <li role="presentation"><a role="menuitem" tabindex="-1" href="#!" class="change-role">Researcher</a></li>
-                                                    <li role="presentation"><a role="menuitem" tabindex="-1" href="#!" class="change-role">Administrator</a></li>
-                                                    <li role="presentation"><a role="menuitem" tabindex="-1" href="#!" class="change-role">Anonymous</a></li>
-                                                </ul>
-                                            </div>
-                                        } else {
-                                            @u.role
-                                        }
-                                    </td>
-                                    <td>
-                                        <div class="dropdown org-dropdown">
-                                            <button class="btn btn-default dropdown-toggle" type="button" id="userOrgDropdown@u.userId" data-toggle="dropdown">
-                                                @u.org.getOrElse("None")
-                                                <span class="caret"></span>
-                                            </button>
-                                            <ul class="dropdown-menu" role="menu" aria-labelledby="userOrgDropdown@u.userId">
-                                                @OrganizationTable.getAllOrganizations.map { org =>
-                                                    <li role="presentation"><a role="menuitem" tabindex="-1" href="#!" class="change-org" data-org-id="@org.orgId">@org.orgName</a></li>
-                                                }
-                                                <li role="presentation"><a role="menuitem" tabindex="-1" href="#!" class="change-org" data-org-id="-1">None</a></li>
-                                            </ul>
-                                        </div>
-                                    </td>
-                                    <td>@u.highQuality</td>
-                                    <td>@u.labels</td>
-                                    <td>@u.ownValidated</td>
-                                    <td>@("%.0f".format(u.ownValidatedAgreedPct * 100))%</td>
-                                    <td>@u.othersValidated</td>
-                                    <td>@("%.0f".format(u.othersValidatedAgreedPct * 100))%</td>
-                                    <td class = 'timestamp'>@u.signUpTime</td>
-                                    <td class = 'timestamp'>@u.lastSignInTime</td>
-                                    <td>@u.signInCount</td>
-                                </tr>
-                                }
+                                <tbody id="user-stats-table-body">
                                 </tbody>
                             </table>
                         </div>
@@ -928,7 +870,6 @@ <h1>Label Search</h1>
 
                 $('#comments-table').dataTable();
                 $('#label-table').dataTable();
-                $('#user-table').dataTable();
                 $('#tabs').tabs().addClass('ui-tabs-vertical ui-helper-clearfix');
                 $('#tabs li').removeClass('ui-corner-top').addClass('ui-corner-left');
             });
diff --git a/app/views/admin/user.scala.html b/app/views/admin/user.scala.html
index 79f9ef3f6e..6f04c543d0 100644
--- a/app/views/admin/user.scala.html
+++ b/app/views/admin/user.scala.html
@@ -54,6 +54,26 @@
                                 <td id="map-legend-audited-street"><svg><path d="M 2 10 L 18 10 z"></path></svg></td>
                                 <td>@Messages("audited.street")</td>
                             </tr>
+                            <tr>
+                                <td id="map-legend-correct"><img src='@routes.Assets.at("javascripts/SVValidate/img/Checkmark.png")'></td>
+                                <td>@Messages("validated.correct")</td>
+                                <td><input type="checkbox" id="correct" checked="true" data-filter-type="label-validations" disabled></td>
+                            </tr>
+                            <tr>
+                                <td id="map-legend-incorrect"><img src='@routes.Assets.at("javascripts/SVValidate/img/Cross.png")'></td>
+                                <td>@Messages("validated.incorrect")</td>
+                                <td><input type="checkbox" id="incorrect" checked="true" data-filter-type="label-validations" disabled></td>
+                            </tr>
+                            <tr>
+                                <td id="map-legend-unsure"><img src='@routes.Assets.at("images/icons/QuestionMark.png")'></td>
+                                <td>@Messages("unsure.caps")</td>
+                                <td><input type="checkbox" id="unsure" checked="true" data-filter-type="label-validations" disabled></td>
+                            </tr>
+                            <tr>
+                                <td id="map-legend-unvalidated"><img src='@routes.Assets.at("images/icons/ExclamationMark.png")'></td>
+                                <td>@Messages("unvalidated")</td>
+                                <td><input type="checkbox" id="unvalidated" checked="true" data-filter-type="label-validations" disabled></td>
+                            </tr>
                         </table>
                     </div>
                 </div>
diff --git a/app/views/forgotPassword.scala.html b/app/views/forgotPassword.scala.html
index 4e5cdd83bd..0a58dd45cc 100644
--- a/app/views/forgotPassword.scala.html
+++ b/app/views/forgotPassword.scala.html
@@ -22,7 +22,6 @@
     <fieldset class="col-md-6 col-md-offset-3" style="margin-top:51px">
         <legend>@Messages("reset.pw.forgot.title")</legend>
         @helper.form(action = routes.ForgotPasswordController.submit()) {
-            <p class = "info">@Messages("reset.pw.forgot.suggest")</p>
             <p class="info">@Messages("reset.pw.forgot.submit.email")</p>
             @text(forgotPasswordForm("emailForgotPassword"), Messages("authenticate.email"), icon = "at")
             <div class="form-group">
diff --git a/app/views/labelMap.scala.html b/app/views/labelMap.scala.html
index 79b3cc0164..e17942977c 100644
--- a/app/views/labelMap.scala.html
+++ b/app/views/labelMap.scala.html
@@ -226,7 +226,7 @@
                     }
                     toggleLabelLayer(checkbox.id.split('-')[0], checkbox, slider, map, mapData);
                 } else if (checkbox.getAttribute('data-filter-type') === 'label-validations') {
-                    filterLabelLayers(checkbox, map, mapData);
+                    filterLabelLayers(checkbox, map, mapData, true);
                 } else if (checkbox.getAttribute('data-filter-type') === 'misc') {
                     toggleMiscLayers(checkbox, map, mapData);
                 } else {
diff --git a/app/views/leaderboard.scala.html b/app/views/leaderboard.scala.html
index ec97e1ffd3..7c9627600f 100644
--- a/app/views/leaderboard.scala.html
+++ b/app/views/leaderboard.scala.html
@@ -8,8 +8,10 @@
 @leaderboardStats = @{UserStatTable.getLeaderboardStats(10)}
 @leaderboardStatsThisWeek = @{UserStatTable.getLeaderboardStats(10, "weekly")}
 @leaderboardStatsByOrg = @{UserStatTable.getLeaderboardStats(10, "overall", true)}
-@leaderboardStatsOrg = @{UserStatTable.getLeaderboardStats(10, "overall", false, UserOrgTable.getAllOrgs(user.get.userId).headOption)}
+@leaderboardStatsOrg = @{UserStatTable.getLeaderboardStats(10, "overall", false, UserOrgTable.getOrg(user.get.userId))}
 @currentCountryId =@{Configs.getCurrentCountryId()}
+@userOrg = @{UserOrgTable.getOrg(user.get.userId)}
+@orgName = @{userOrg.flatMap(orgId => OrganizationTable.getOrganizationName(orgId)).getOrElse("Team Name Not Found")}
 
 <div class="leaderboard-container">
     <div class="item leaderboard-table">
@@ -239,10 +241,10 @@ <h1 class="leaderboard-header weekly-header">@Messages("leaderboard.weekly.title
             </div>
         </div>
     }
-    @if(user && user.get.role.getOrElse("") != "Anonymous" && !UserOrgTable.getAllOrgs(user.get.userId).isEmpty) {
+    @if(user && user.get.role.getOrElse("") != "Anonymous" && !userOrg.isEmpty) {
         <div class="item leaderboard-table">
-            <h1 class="leaderboard-header">@Messages("leaderboard.org.title", OrganizationTable.getOrganizationName(UserOrgTable.getAllOrgs(user.get.userId).head).getOrElse(""))</h1>
-            <h5>@Messages("leaderboard.org.detail", OrganizationTable.getOrganizationName(UserOrgTable.getAllOrgs(user.get.userId).head).getOrElse(""))</h5>
+            <h1 class="leaderboard-header">@Messages("leaderboard.org.title", orgName)</h1>
+            <h5>@Messages("leaderboard.org.detail", orgName)</h5>
             <div class="panel panel-default">
                 <table class="table table-bordered leaderboard-table-striped">
                     <thead class="leaderboard-table-header">
@@ -325,7 +327,7 @@ <h4 id="leaderboard-encouragement">
     @if(user && user.get.role.getOrElse("") == "Anonymous") {
         @Html(Messages("leaderboard.encouragement.no.user"))
     } else {
-        @if(UserOrgTable.getAllOrgs(user.get.userId).isEmpty) {
+        @if(userOrg.isEmpty) {
             @if(currentCountryId == "taiwan") {
                 @Html(Messages("leaderboard.encouragement.no.org", routes.Assets.at("documents/labeling-guide-Taiwan.pdf").url))
             } else {
diff --git a/app/views/main.scala.html b/app/views/main.scala.html
index 494c128bca..6c0c10befe 100644
--- a/app/views/main.scala.html
+++ b/app/views/main.scala.html
@@ -165,20 +165,9 @@
     }
 
     <script>
-        var oldAnalyticsStr = "@{Play.configuration.getString(s"city-params.old-google-analytics-id.${environmentType}.${cityId}")}";
-        if (oldAnalyticsStr) {
-            (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-                (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-                    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-            })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-            ga('create', oldAnalyticsStr, 'auto');
-            ga('send', 'pageview');
-        }
-
         // Log clicks on links in the footer to WebpageActivityTable
         // Depending on column, form of log varies by the following:
-        // Column is 'Project Sidewalk' or "Developer'
+        // Column is 'Project Sidewalk' or 'Developer'
         //    log is of form: "Click_module=Footer_section=<"sidewalk" or "developer">_target=<link>"
         // Column is 'Connect'
         //    log is of form: "Click_module=Footer_section=connect_platform=<"github", "twitter", or "email">"
diff --git a/app/views/userProfile.scala.html b/app/views/userProfile.scala.html
index 01a4513613..1688853124 100644
--- a/app/views/userProfile.scala.html
+++ b/app/views/userProfile.scala.html
@@ -5,6 +5,8 @@
 @import models.label.LabelTable
 @import models.label.LabelValidationTable
 @(title: String, user: Option[User] = None, auditedDistance: Float)(implicit lang: Lang)
+@userOrg = @{UserOrgTable.getOrg(user.get.userId)}
+@orgName = @{userOrg.flatMap(orgId => OrganizationTable.getOrganizationName(orgId)).getOrElse("Team Name Not Found")}
 
 @main(title) {
     @navbar(user, user.map(u=> "/dashboard"))
@@ -14,26 +16,31 @@
             <div class="row" id="profile-container">
                 <div id="username">@user.get.username</div>
                 <div id="org-container">
-                    @if(!UserOrgTable.getAllOrgs(user.get.userId).isEmpty) {
-                        <div id="org-name">@OrganizationTable.getOrganizationName(UserOrgTable.getAllOrgs(user.get.userId).head)</div>
-                    } else {
-                        <div id="org-name">@Messages("dashboard.no.org")</div>
-                    }
-                    <div id="edit-org-dropdown" class="dropdown" data-toggle="popover" data-trigger="hover" data-placement="right" data-content="@Messages("dashboard.edit.info")">
-                        <a id="edit-org-button" role="button" data-toggle="dropdown" href="#">@Messages("dashboard.edit.org") <b class="caret"></b></a>
-                        <ul id="edit-org-menu" class="dropdown-menu" role="menu">
-                            @if(OrganizationTable.getAllOrganizations.isEmpty) {
-                                <li class="menu-info">@Messages("dashboard.orgs.unavailable")</li>
+                    <div id="edit-org-dropdown" class="dropdown">
+                        <a id="edit-org-button" role="button" data-toggle="dropdown" href="#">
+                            @if(userOrg.isDefined) {
+                                @Messages("dashboard.current.team.greeting", orgName) <b class="caret"></b>
+                            } else {
+                                @Messages("dashboard.join.team") <b class="caret"></b>
                             }
-                            @if(!UserOrgTable.getAllOrgs(user.get.userId).isEmpty) {
+                        </a>
+                        <ul id="edit-org-menu" class="dropdown-menu" role="menu">
+                            @if(userOrg.isDefined) {
                                 <li>
-                                    <a id="from-@UserOrgTable.getAllOrgs(user.get.userId).headOption.getOrElse(0)-to-0" role="menuitem" class="put-user-org">@Messages("dashboard.leave.org")</a>
+                                    <a id="from-@userOrg.getOrElse(0)-to-0" role="menuitem" class="put-user-org">
+                                        <strong>@Messages("dashboard.leave.team", orgName)</strong>
+                                    </a>
                                 </li>
                             }
+                            <li>
+                                <a id="create-org-button" role="menuitem" class="create-org" data-toggle="modal" data-target="#create-team-modal" href="#"><strong>@Messages("dashboard.create.team")</strong></a>
+                            </li>
                             @for(org <- OrganizationTable.getAllOrganizations) {
-                                <li class="put-org-container" data-toggle="popover" data-container="body" data-trigger="hover" data-placement="right" data-content="@org.orgDescription">
-                                    <a id="from-@UserOrgTable.getAllOrgs(user.get.userId).headOption.getOrElse(0)-to-@org.orgId" role="menuitem" class="put-user-org">@org.orgName</a>
-                                </li>
+                                @if(org.orgId!= userOrg.getOrElse(-1)){
+                                    <li class="put-org-container" data-toggle="popover" data-container="body" data-trigger="hover" data-placement="right" data-content="@org.orgDescription">
+                                        <a id="from-@userOrg.getOrElse(0)-to-@org.orgId" role="menuitem" class="put-user-org">@org.orgName</a>
+                                    </li>
+                                }
                             }
                         </ul>
                     </div>
@@ -41,6 +48,36 @@
             </div>
         }
 
+        <div class="modal fade" id="create-team-modal" tabindex="-1" role="dialog" aria-labelledby="create-team-modal-label" aria-hidden="true">
+            <div class="modal-dialog modal-dialog-centered" role="document">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h5 class="modal-title" id="create-team-modal-label">@Messages("dashboard.team.title")</h5>
+                        <button type="button" class="close custom-close" data-dismiss="modal" aria-label="Close">
+                            <span aria-hidden="true">&times;</span>
+                        </button>
+                    </div>
+                    <div class="modal-body">
+                        <form id="create-team-form">
+                            <div class="form-group">
+                                <label for="team-name-input">@Messages("dashboard.team.name")</label>
+                                <input type="text" class="form-control" id="team-name-input" required>
+                            </div>
+                            <div class="form-group">
+                                <label for="team-description-input">@Messages("dashboard.team.description")</label>
+                                <textarea class="form-control" id="team-description-input" required></textarea>
+                            </div>
+                        </form>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-secondary" data-dismiss="modal">@Messages("cancel")</button>
+                        <button type="button" class="btn btn-primary" id="save-team-button">@Messages("dashboard.team.button")</button>
+                    </div>
+                </div>
+            </div>
+        </div>        
+
+
         <div class="row" id="map-row">
             <div class="col-lg-12" id="map-column">
                 <div id="user-dashboard-choropleth-holder" class="choropleth-holder">
@@ -79,6 +116,26 @@
                                 <td id="map-legend-audited-street"><svg><path d="M 2 10 L 18 10 z"></path></svg></td>
                                 <td>@Messages("audited.street")</td>
                             </tr>
+                            <tr>
+                                <td id="map-legend-correct"><img src='@routes.Assets.at("javascripts/SVValidate/img/Checkmark.png")'></td>
+                                <td>@Messages("validated.correct")</td>
+                                <td><input type="checkbox" id="correct" checked="true" data-filter-type="label-validations" disabled></td>
+                            </tr>
+                            <tr>
+                                <td id="map-legend-incorrect"><img src='@routes.Assets.at("javascripts/SVValidate/img/Cross.png")'></td>
+                                <td>@Messages("validated.incorrect")</td>
+                                <td><input type="checkbox" id="incorrect" checked="true" data-filter-type="label-validations" disabled></td>
+                            </tr>
+                            <tr>
+                                <td id="map-legend-unsure"><img src='@routes.Assets.at("images/icons/QuestionMark.png")'></td>
+                                <td>@Messages("unsure.caps")</td>
+                                <td><input type="checkbox" id="unsure" checked="true" data-filter-type="label-validations" disabled></td>
+                            </tr>
+                            <tr>
+                                <td id="map-legend-unvalidated"><img src='@routes.Assets.at("images/icons/ExclamationMark.png")'></td>
+                                <td>@Messages("unvalidated")</td>
+                                <td><input type="checkbox" id="unvalidated" checked="true" data-filter-type="label-validations" disabled></td>
+                            </tr>
                         </table>
                     </div>
                 </div>
@@ -208,7 +265,7 @@ <h2 id="recent-mistakes">@Messages("dashboard.mistakes.header")</h2>
             i18next.use(i18nextHttpBackend).init({
                 backend: { loadPath: '/assets/locales/{{lng}}/{{ns}}.json' },
                 fallbackLng: 'en',
-                ns: ['dashboard', 'common'],
+                ns: ['dashboard', 'common', 'labelmap'],
                 defaultNS: 'dashboard',
                 lng: "@lang.code",
                 debug: false
diff --git a/build.sbt b/build.sbt
index 3f2bd1914b..6fb1d78853 100644
--- a/build.sbt
+++ b/build.sbt
@@ -2,7 +2,7 @@ import play.PlayScala
 
 name := """sidewalk-webpage"""
 
-version := "8.0.0"
+version := "8.0.1"
 
 scalaVersion := "2.10.7"
 
@@ -63,6 +63,4 @@ javacOptions ++= Seq("-source", "1.8", "-target", "1.8")
 
 javaOptions ++= Seq("-Xmx4096M", "-Xms2048M")
 
-javaOptions in Test += "-Dconfig.file=conf/application.test.conf"
-
 fork in run := true
diff --git a/conf/application.conf b/conf/application.conf
index 47152819be..ee2eeded73 100644
--- a/conf/application.conf
+++ b/conf/application.conf
@@ -36,7 +36,6 @@ application.global=app.Global
 #
 db.default.driver=org.postgresql.Driver
 db.default.url="jdbc:postgresql://db:5432/sidewalk"
-# db.default.user=sa
 db.default.user="sidewalk"
 db.default.password="sidewalk"
 db.default.idleMaxAge=2 minute  # default is 10 minutes
@@ -46,7 +45,7 @@ db.default.minConnectionsPerPartition=4  # default is 5
 
 
 # Override default url if environment variable is present.
-db.default.url=${?DATABASE_URL}
+db.default.url=${?DATABASE_URL} # Only used on actual servers, not in dev env.
 db.default.user=${?DATABASE_USER}
 db.default.password=${?DATABASE_PASSWORD}
 
@@ -145,5 +144,11 @@ custom.news.ribbon.link = ""
 cropped.image.directory = "/home/.crops"
 cropped.image.directory = ${?SIDEWALK_IMAGES_DIR}
 
+# Authentication cookie settings. Updated to share across subdomains (i.e., across cities).
+application.session.cookie.domain=".cs.washington.edu"
+session.domain=".cs.washington.edu"
+session.secure=false
+session.httpOnly=true
+
 include "silhouette.conf"
 include "cityparams.conf"
diff --git a/conf/application.test.conf b/conf/application.test.conf
index 0254c22e5b..b27c5bb043 100644
--- a/conf/application.test.conf
+++ b/conf/application.test.conf
@@ -1,9 +1,4 @@
 include "application.conf"
 
-db.default.url="jdbc:postgresql://localhost:5432/sidewalk_test"
-# db.default.user=sa
-db.default.user="sidewalk"
-db.default.password="sidewalk"
-
-# evolutionplugin=enabled
-# applyEvolutions.sidewalk=true
\ No newline at end of file
+application.session.cookie.domain=""
+session.domain=""
diff --git a/conf/cityparams.conf b/conf/cityparams.conf
index 9c25aac13f..442e4b0d21 100644
--- a/conf/cityparams.conf
+++ b/conf/cityparams.conf
@@ -30,6 +30,9 @@ city-params {
     "st-louis-mo"
     "la-ca"
     "mendota-il"
+    "knox-oh"
+    "kaohsiung-tw"
+    "taichung-tw"
   ]
   city-short-name {
     washington-dc = "DC"
@@ -53,6 +56,7 @@ city-params {
     st-louis-mo = "missouri"
     la-ca = "california"
     mendota-il = "illinois"
+    knox-oh = "ohio"
   }
   country-id {
     newberg-or = "usa"
@@ -81,6 +85,9 @@ city-params {
     st-louis-mo = "usa"
     la-ca = "usa"
     mendota-il = "usa"
+    knox-oh = "usa"
+    kaohsiung-tw = "taiwan"
+    taichung-tw = "taiwan"
   }
   status {
     newberg-or = "public"
@@ -109,6 +116,9 @@ city-params {
     st-louis-mo = "public"
     la-ca = "private"
     mendota-il = "public"
+    knox-oh = "public"
+    kaohsiung-tw = ${city-params.status.taipei}
+    taichung-tw = ${city-params.status.taipei}
   }
   launch-date {
     newberg-or = "2019-01-31"
@@ -136,6 +146,9 @@ city-params {
     st-louis-mo = "2024-4-10"
     la-ca = "2024-9-16"
     mendota-il = "2024-9-16"
+    knox-oh = "2024-11-11"
+    kaohsiung-tw = "2024-11-11"
+    taichung-tw = "2024-11-11"
   }
   skyline-img = {
     newberg-or = "skyline1.png"
@@ -164,6 +177,9 @@ city-params {
     st-louis-mo = "skyline1.png"
     la-ca = "skyline1.png"
     mendota-il = "skyline1.png"
+    knox-oh = "skyline1.png"
+    kaohsiung-tw = ${city-params.skyline-img.taipei}
+    taichung-tw = ${city-params.skyline-img.taipei}
   }
   logo-img = {
     newberg-or = "sidewalk-logo.png"
@@ -192,6 +208,9 @@ city-params {
     st-louis-mo = "sidewalk-logo.png"
     la-ca = "sidewalk-logo.png"
     mendota-il = "sidewalk-logo.png"
+    knox-oh = "sidewalk-logo.png"
+    kaohsiung-tw = ${city-params.logo-img.taipei}
+    taichung-tw = ${city-params.logo-img.taipei}
   }
   landing-page-url {
     prod {
@@ -221,6 +240,9 @@ city-params {
       st-louis-mo = "https://sidewalk-st-louis.cs.washington.edu"
       la-ca = "https://sidewalk-la.cs.washington.edu"
       mendota-il = "https://sidewalk-mendota.cs.washington.edu"
+      knox-oh = "https://sidewalk-knox.cs.washington.edu"
+      kaohsiung-tw = "https://sidewalk-kaohsiung.cs.washington.edu"
+      taichung-tw = "https://sidewalk-taichung.cs.washington.edu"
     }
     test {
       newberg-or = "https://sidewalk-newberg-test.cs.washington.edu"
@@ -249,6 +271,9 @@ city-params {
       st-louis-mo = "https://sidewalk-st-louis-test.cs.washington.edu"
       la-ca = "https://sidewalk-la-test.cs.washington.edu"
       mendota-il = "https://sidewalk-mendota-test.cs.washington.edu"
+      knox-oh = "https://sidewalk-knox-test.cs.washington.edu"
+      kaohsiung-tw = "https://sidewalk-kaohsiung-test.cs.washington.edu"
+      taichung-tw = "https://sidewalk-taichung-test.cs.washington.edu"
     }
   }
   google-analytics-4-id {
@@ -279,6 +304,9 @@ city-params {
       st-louis-mo = "G-3HL22FM4BS"
       la-ca = "G-815WLSJ888"
       mendota-il = "G-1CYXWS6195"
+      knox-oh = "G-QKX0CSTXXE"
+      kaohsiung-tw = "G-GCWWM428SX"
+      taichung-tw = "G-M24PL5F2Z7"
     }
     test {
       newberg-or = "G-P2JPSFFN3H"
@@ -306,27 +334,9 @@ city-params {
       st-louis-mo = "G-DJMP9QBM0M"
       la-ca = "G-LJKNZP9DYK"
       mendota-il = "G-2V84GVCHV4"
-    }
-  }
-  // New cities have ony GA 4. Old cities also retain the old GA tracking.
-  old-google-analytics-id {
-    prod {
-      newberg-or = "UA-136713858-1"
-      washington-dc = "UA-76528208-1"
-      seattle-wa = "UA-136685580-1"
-      columbus-oh = "UA-151353296-1"
-      cdmx = "UA-153189107-1"
-      spgg = "UA-167201803-1"
-      pittsburgh-pa = "UA-173904238-1"
-    }
-    test {
-      newberg-or = "UA-136713858-2"
-      washington-dc = "UA-76528208-3"
-      seattle-wa = "UA-136685580-2"
-      columbus-oh = "UA-151353296-2"
-      cdmx = "UA-153189107-2"
-      spgg = "UA-167201803-2"
-      pittsburgh-pa = "UA-173904238-2"
+      knox-oh = "G-X55P3NXCSX"
+      kaohsiung-tw = "G-QKLBVC4YR4"
+      taichung-tw = "G-J9CWR4T8T6"
     }
   }
 }
diff --git a/conf/evolutions/default/253.sql b/conf/evolutions/default/253.sql
new file mode 100644
index 0000000000..8aed90610b
--- /dev/null
+++ b/conf/evolutions/default/253.sql
@@ -0,0 +1,70 @@
+# --- !Ups
+INSERT INTO tag (tag_id, label_type_id, tag, mutually_exclusive_with) SELECT 72, label_type_id, 'not aligned with crosswalk', NULL FROM label_type WHERE label_type.label_type = 'CurbRamp';
+INSERT INTO tag (tag_id, label_type_id, tag, mutually_exclusive_with) SELECT 73, label_type_id, 'utility cabinet', NULL FROM label_type WHERE label_type.label_type = 'Obstacle';
+INSERT INTO tag (tag_id, label_type_id, tag, mutually_exclusive_with) SELECT 74, label_type_id, 'cycle lane: protection from traffic', 'cycle lane: no protection from traffic' FROM label_type WHERE label_type.label_type = 'Other';
+INSERT INTO tag (tag_id, label_type_id, tag, mutually_exclusive_with) SELECT 75, label_type_id, 'cycle lane: no protection from traffic', 'cycle lane: protection from traffic' FROM label_type WHERE label_type.label_type = 'Other';
+INSERT INTO tag (tag_id, label_type_id, tag, mutually_exclusive_with) SELECT 76, label_type_id, 'cycle lane: surface problem', NULL FROM label_type WHERE label_type.label_type = 'Other';
+INSERT INTO tag (tag_id, label_type_id, tag, mutually_exclusive_with) SELECT 77, label_type_id, 'cycle lane: faded paint', NULL FROM label_type WHERE label_type.label_type = 'Other';
+INSERT INTO tag (tag_id, label_type_id, tag, mutually_exclusive_with) SELECT 78, label_type_id, 'cycle lane: debris / pooled water', NULL FROM label_type WHERE label_type.label_type = 'Other';
+INSERT INTO tag (tag_id, label_type_id, tag, mutually_exclusive_with) SELECT 79, label_type_id, 'cycle lane: parked car', NULL FROM label_type WHERE label_type.label_type = 'Other';
+INSERT INTO tag (tag_id, label_type_id, tag, mutually_exclusive_with) SELECT 80, label_type_id, 'cycle box', NULL FROM label_type WHERE label_type.label_type = 'Other';
+
+-- Hide 'not aligned with crosswalk' and 'utility cabinet' tags in non-Taiwanese cities.
+UPDATE config
+SET excluded_tags = REPLACE(excluded_tags, '"]', '" "not aligned with crosswalk" "utility cabinet"]')
+WHERE current_schema() NOT IN ('sidewalk_taipei', 'sidewalk_new_taipei', 'sidewalk_keelung', 'sidewalk_taichung', 'sidewalk_kaohsiung');
+
+-- Only show cycle lane tags in Chicago.
+UPDATE config
+SET excluded_tags = REPLACE(excluded_tags, '"]', '" "cycle lane: protection from traffic" "cycle lane: no protection from traffic" "cycle lane: surface problem" "cycle lane: faded paint" "cycle lane: debris / pooled water" "cycle lane: parked car" "cycle box"]')
+WHERE current_schema() <> 'sidewalk_chicago';
+
+# --- !Downs
+UPDATE config SET excluded_tags = REPLACE(excluded_tags, ' "cycle box"', '');
+UPDATE config SET excluded_tags = REPLACE(excluded_tags, ' "cycle lane: parked car"', '');
+UPDATE config SET excluded_tags = REPLACE(excluded_tags, ' "cycle lane: debris / pooled water"', '');
+UPDATE config SET excluded_tags = REPLACE(excluded_tags, ' "cycle lane: faded paint"', '');
+UPDATE config SET excluded_tags = REPLACE(excluded_tags, ' "cycle lane: surface problem"', '');
+UPDATE config SET excluded_tags = REPLACE(excluded_tags, ' "cycle lane: no protection from traffic"', '');
+UPDATE config SET excluded_tags = REPLACE(excluded_tags, ' "cycle lane: protection from traffic"', '');
+UPDATE config SET excluded_tags = REPLACE(excluded_tags, ' "utility cabinet"', '');
+UPDATE config SET excluded_tags = REPLACE(excluded_tags, ' "not aligned with crosswalk"', '');
+
+UPDATE label_history SET tags = array_remove(tags, 'cycle box');
+UPDATE label_history SET tags = array_remove(tags, 'cycle lane: parked car');
+UPDATE label_history SET tags = array_remove(tags, 'cycle lane: debris / pooled water');
+UPDATE label_history SET tags = array_remove(tags, 'cycle lane: faded paint');
+UPDATE label_history SET tags = array_remove(tags, 'cycle lane: surface problem');
+UPDATE label_history SET tags = array_remove(tags, 'cycle lane: no protection from traffic');
+UPDATE label_history SET tags = array_remove(tags, 'cycle lane: protection from traffic');
+UPDATE label_history SET tags = array_remove(tags, 'utility cabinet');
+UPDATE label_history SET tags = array_remove(tags, 'not aligned with crosswalk');
+
+-- Delete entries in the label_history table that no longer represent a change in history after removing the tag.
+DELETE FROM label_history
+WHERE label_history_id IN (
+    SELECT label_history_id
+    FROM (
+        SELECT label_history_id, label_id, severity, tags,
+               LAG(severity) OVER (PARTITION BY label_id ORDER BY edit_time) AS prev_severity,
+               LAG(tags) OVER (PARTITION BY label_id ORDER BY edit_time) AS prev_tags
+        FROM label_history
+    ) subquery
+    WHERE severity = prev_severity
+        AND tags = prev_tags
+);
+
+DELETE FROM tag
+USING label_type
+WHERE tag.label_type_id = label_type.label_type_id
+    AND (
+        label_type.label_type = 'CurbRamp' AND tag.tag = 'not aligned with crosswalk'
+        OR label_type.label_type = 'Obstacle' AND tag.tag = 'utility cabinet'
+        OR label_type.label_type = 'Other' AND tag.tag = 'cycle lane: protection from traffic'
+        OR label_type.label_type = 'Other' AND tag.tag = 'cycle lane: no protection from traffic'
+        OR label_type.label_type = 'Other' AND tag.tag = 'cycle lane: surface problem'
+        OR label_type.label_type = 'Other' AND tag.tag = 'cycle lane: faded paint'
+        OR label_type.label_type = 'Other' AND tag.tag = 'cycle lane: debris / pooled water'
+        OR label_type.label_type = 'Other' AND tag.tag = 'cycle lane: parked car'
+        OR label_type.label_type = 'Other' AND tag.tag = 'cycle box'
+    );
diff --git a/conf/evolutions/default/254.sql b/conf/evolutions/default/254.sql
new file mode 100644
index 0000000000..842a5b3336
--- /dev/null
+++ b/conf/evolutions/default/254.sql
@@ -0,0 +1,5 @@
+# --- !Ups
+INSERT INTO version VALUES ('8.0.1', now(), 'Authentication is now shared between all servers, no need to login multiple times!');
+
+# --- !Downs
+DELETE FROM version WHERE version_id = '8.0.1';
diff --git a/conf/messages b/conf/messages
index 93637485e4..ef1e2233bb 100644
--- a/conf/messages
+++ b/conf/messages
@@ -31,6 +31,9 @@ city.name.walla-walla-wa = Walla Walla
 city.name.st-louis-mo = St. Louis
 city.name.la-ca = Los Angeles
 city.name.mendota-il = Mendota
+city.name.knox-oh = Knox County
+city.name.kaohsiung-tw = Kaohsiung
+city.name.taichung-tw = Taichung
 
 state.name.oregon = Oregon
 state.name.dc = DC
diff --git a/conf/messages.de b/conf/messages.de
index 25f73f71d6..479e6dc4ae 100644
--- a/conf/messages.de
+++ b/conf/messages.de
@@ -282,7 +282,6 @@ authenticate.error.generic = Bei der Beantwortung Ihrer Anfrage ist ein Fehler a
 
 reset.pw.forgot.title = Passwort vergessen?
 reset.pw.forgot.submit.email = Geben Sie bitte Ihre E-Mail-Adresse an. Wir werden Ihnen einen Link zum Zurücksetzen Ihres Passworts senden.
-reset.pw.forgot.suggest = Wenn Sie Probleme beim Anmelden oder dem Zurücksetzens Ihres Passworts haben, vergewissern Sie sich, dass die richtige Stadt rechts oben auf der Navigationsleiste angezeigt wird. Der erstellte Account ist nicht auf andere Städte übertragbar, Sie müssen also für jede Stadt einen neuen Account anlegen (Sie können aber denselben Benutzername/dasselbe Passwort wiederverwenden).
 
 reset.pw.email.hello = Hallo {0},
 reset.pw.email.reset.title = Passwort für den Project Sidewalk-Account zurücksetzen.
@@ -304,11 +303,10 @@ results.legend.high = Hoch
 results.legend.low = Tief
 results.legend.body = In grauen Quartier ist die Datenmenge nicht ausreichend, um die Zugänglichkeit zu beurteilen. Klicken Sie auf ein beliebiges Quartier, um Daten beizutragen. Sie können die Daten selbst mit <a href="/api" target="_blank">unseren APIs</a> selbst untersuchen!
 
-dashboard.no.org = Keine Organisation
-dashboard.edit.org = Bearbeiten
-dashboard.edit.info = Wenn Sie Ihre Organisation nicht sehen, senden Sie eine E-Mail an <a id="email-link" href="mailto:sidewalk@cs.uw.edu" target="_blank">sidewalk@cs.uw.edu</a> und geben Sie den Namen der Organisation und eine Beschreibung an.
-dashboard.orgs.unavailable = Keine Organisationen verfügbar!
-dashboard.leave.org = Organisation verlassen
+dashboard.current.team.greeting = Team: {0}
+dashboard.leave.team = Team verlassen: {0}
+dashboard.create.team = Bilden Sie ein Team
+dashboard.join.team = Treten Sie einem Team bei!
 dashboard.total.distance.explored = Gesamte erkundete Distanz
 dashboard.number.completed.missions = Anzahl beendeter Missionen
 dashboard.number.of.labels = Anzahl Beschriftungen
@@ -332,6 +330,10 @@ dashboard.validation.badge = {0} Validierungsabzeichen
 dashboard.mistakes.header = Ihre jüngsten Beschriftungsfehler
 dashboard.mistakes.tooltip = Diese Fehler werden von anderen Nutzenden auf der Validierungsseite bestimmt. Bei der Validierung passieren manchmal Fehler und bei den Bewertungen gibt es oft feine Unterschiede.
 dashboard.mistakes.tooltip.alt = Fragezeichensymbol für hilfreichen Tooltip.
+dashboard.team.title = Erstellen Sie ein neues team
+dashboard.team.name = Teamname
+dashboard.team.description = Teambeschreibung (optional)
+dashboard.team.button = Team erstellen
 
 labeling.guide.curb.ramp.summary = Eine Trottoirabsenkung ist eine kurze Rampe, die einen erhöhten Randstein unterbricht oder zu ihm hinaufführt. Eine zugängliche Trottoirabsenkung bietet eine barrierefreie Route für Personen mit Mobilitätseinschränkungen, um sicher vom Trottoir zur Fahrbahn und umgekehrt zu gelangen (<a href="https://www.ada.gov/pcatoolkit/chap6toolkit.htm">ADA</a>). Beschriften Sie jede Bordsteinrampe unabhängig davon, ob es Probleme gibt.
 labeling.guide.obstacle.summary = Hindernisse sind Objekte, die sich auf dem Gehweg befinden und den Weg blockieren. Gemäss den Richtlinien für behindertengerechte Fusswegnetze sind Trottoirbreiten unter 1.50 m zu vermeiden. Dies erlaubt Fussgängerinnen und Fussgängern, vor allem denjenigen, die Rollatoren oder Rollstühle nutzen, sicher auf dem Gehweg zu bleiben. Den Gehweg zu verlassen, um Hindernissen auszuweichen, ist zum Teil nicht möglich oder erhöht die Gefahr, das Gleichgewicht zu verlieren oder zu stolpern.
diff --git a/conf/messages.en b/conf/messages.en
index 4ceb218d57..ea11b5cd3b 100644
--- a/conf/messages.en
+++ b/conf/messages.en
@@ -275,7 +275,6 @@ authenticate.error.generic = Something went wrong processing your request. Pleas
 
 reset.pw.forgot.title = Forgot your password?
 reset.pw.forgot.submit.email = Type in your email and we’ll send you a link to reset your password.
-reset.pw.forgot.suggest = If you are having trouble logging in or resetting your password, check that you are looking at the city where you made your account by checking the navbar on the top-right of the page. Accounts are not interchangeable between different cities, so you'll need to make a new account for each city (you can use the same username/password).
 
 reset.pw.email.hello = Hi {0},
 reset.pw.email.reset.title = Reset Your Project Sidewalk Account Password
@@ -297,11 +296,10 @@ results.legend.high = High
 results.legend.low = Low
 results.legend.body = Gray neighborhoods lack sufficient data to assess sidewalk problems. Click on any neighborhood to start contributing. You can explore the data yourself using <a href="/api" target="_blank">our APIs</a>!
 
-dashboard.no.org = No Organization
-dashboard.edit.org = Edit
-dashboard.edit.info = If you don''t see your organization, please email <a id="email-link" href="mailto:sidewalk@cs.uw.edu" target="_blank">sidewalk@cs.uw.edu</a> and include your organization name and description.
-dashboard.orgs.unavailable = There are no available organizations!
-dashboard.leave.org = Leave Organization
+dashboard.current.team.greeting = Team: {0}
+dashboard.leave.team = Leave team: {0}
+dashboard.create.team = Create a team
+dashboard.join.team = Join a team!
 dashboard.total.distance.explored = Total Distance Explored
 dashboard.number.completed.missions = Number of Completed Missions
 dashboard.number.of.labels = Number of Labels
@@ -325,6 +323,10 @@ dashboard.validation.badge = {0} validation badge
 dashboard.mistakes.header = Your recent labeling mistakes
 dashboard.mistakes.tooltip = These are mistakes as determined by other users from the Validate page. Sometimes mistakes happen while validating, and there is often nuance in these evaluations.
 dashboard.mistakes.tooltip.alt = Question mark icon for helpful tooltip.
+dashboard.team.title = Create a new team
+dashboard.team.name = Team name
+dashboard.team.description = Team description (optional)
+dashboard.team.button = Create team
 
 labeling.guide.curb.ramp.summary = A curb ramp is a short ramp that cuts through or builds up to a curb. An accessible curb ramp is one that provides an accessible route for people with mobility impairments to safely transition from a curbed sidewalk to a roadway, or vice versa (<a href="https://www.ada.gov/pcatoolkit/chap6toolkit.htm">ADA</a>). Label every curb ramp regardless of whether there are problems.
 labeling.guide.obstacle.summary = Obstacles are objects that are directly on the path of a pedestrian route, thus blocking the path. The ADA (Americans with Disabilities Act) requires a "clear floor or ground space" along accessible pedestrian routes. This allows pedestrians, especially those using walkers or wheelchairs, to remain safely on the sidewalk or crosswalk. Moving off the path to avoid an obstacle may be impossible or may cause imbalance, tripping, or other hazards.
diff --git a/conf/messages.en-NZ b/conf/messages.en-NZ
index 796940ab36..09fb510c24 100644
--- a/conf/messages.en-NZ
+++ b/conf/messages.en-NZ
@@ -41,4 +41,4 @@ results.legend.body = Gray neighbourhoods lack sufficient data to assess footpat
 dashboard.no.org = No Organisation
 dashboard.edit.info = If you don''t see your organisation, please email <a id="email-link" href="mailto:sidewalk@cs.uw.edu" target="_blank">sidewalk@cs.uw.edu</a> and include your organisation name and description.
 dashboard.orgs.unavailable = There are no available organisations!
-dashboard.leave.org = Leave Organisation
\ No newline at end of file
+dashboard.leave.org = Leave Organisation
diff --git a/conf/messages.es b/conf/messages.es
index 79ed9079f0..58a957df5c 100644
--- a/conf/messages.es
+++ b/conf/messages.es
@@ -60,6 +60,7 @@ city.name.zurich = Zúrich
 city.name.new-taipei-tw = Nuevo Taipei
 city.name.st-louis-mo = San Luis
 city.name.la-ca = Los Ángeles
+city.name.knox = Condado de Knox
 
 state.name.oregon = Oregón
 state.name.pennsylvania = Pensilvania
@@ -286,7 +287,6 @@ authenticate.error.generic = Algo salió mal al procesar su solicitud. Por favor
 
 reset.pw.forgot.title = Olvidaste tu contraseña
 reset.pw.forgot.submit.email = Escribe tu correo electrónico y te enviaremos un enlace para restablecer tu contraseña.
-reset.pw.forgot.suggest = Si tiene problemas para iniciar sesión o restablecer su contraseña, compruebe que está mirando la ciudad donde creó su cuenta consultando la barra de navegación en la parte superior derecha de la página. Las cuentas no son intercambiables entre diferentes ciudades, por lo que deberá crear una nueva cuenta para cada ciudad (puede usar el mismo nombre de usuario/contraseña).
 
 reset.pw.email.hello = Hola {0},
 reset.pw.email.reset.title = Restablecer la contraseña de tu cuenta de Project Sidewalk
@@ -308,11 +308,10 @@ results.legend.high = Alto
 results.legend.low = Bajo
 results.legend.body = Los barrios grises carecen de datos suficientes para evaluar los problemas de las banquetas. Haz clic en cualquier barrio para empezar a contribuir. ¡Puede explorar los datos usted mismo usando <a href="/api" target="_blank">nuestras API</a>!
 
-dashboard.no.org = Sin Organización
-dashboard.edit.org = Editar
-dashboard.edit.info = Si no ve su organización, envíe un correo electrónico a <a id="email-link" href="mailto:sidewalk@cs.uw.edu" target="_blank">sidewalk@cs.uw.edu</a> con el nombre y la descripción de su organización.
-dashboard.orgs.unavailable = ¡No hay organizaciones disponibles!
-dashboard.leave.org = Salir la Organización
+dashboard.current.team.greeting = Equipo: {0}
+dashboard.leave.team = Dejar el equipo: {0}
+dashboard.create.team = Crear un equipo
+dashboard.join.team = ¡Únete a un equipo!
 dashboard.total.distance.explored = Distancia total explorada
 dashboard.number.completed.missions = Número de misiones completadas
 dashboard.number.of.labels = Número de etiquetas
@@ -336,6 +335,10 @@ dashboard.validation.badge = {0} insignia de validación
 dashboard.mistakes.header = Sus errores de etiquetado recientes
 dashboard.mistakes.tooltip = Estos son errores determinados por otros usuarios desde la página Validar. A veces ocurren errores durante la validación y, a menudo, hay matices en estas evaluaciones.
 dashboard.mistakes.tooltip.alt = Icono de signo de interrogación para información sobre herramientas útil.
+dashboard.team.title = Crear un nuevo equipo
+dashboard.team.name = Nombre del equipo
+dashboard.team.description = Descripción del equipo (opcional)
+dashboard.team.button = Crear equipo
 
 labeling.guide.curb.ramp.summary = Una rampa peatonal es una rampa corta que atraviesa o se incorpora a una banqueta. Una rampa peatonal accesible es aquella que proporciona una ruta accesible para que las personas con impedimentos de movilidad puedan transitar con seguridad de una banqueta a una calle, o viceversa (<a href="https://www.ada.gov/pcatoolkit/chap6toolkit.htm">ADA</a>). Etiquete cada rampa de acera independientemente de si hay problemas.
 labeling.guide.obstacle.summary = Los obstáculos son objetos que están directamente en el camino de una ruta peatonal, bloqueando así el camino. La Ley sobre Estadounidenses con Discapacidades (ADA, por sus siglas en inglés) exige un "camino despejado o espacio en el suelo" a lo largo de las rutas peatonales accesibles. Esto permite a las personas peatonas, especialmente a las que usan andadores o sillas de ruedas, permanecer con seguridad en la banqueta o en el cruce peatonal. Salirse del camino, para evitar un obstáculo, puede ser imposible o puede causar desequilibrio, tropiezos u otros peligros para las personas.
diff --git a/conf/messages.nl b/conf/messages.nl
index 0d106065f6..dba3f28916 100644
--- a/conf/messages.nl
+++ b/conf/messages.nl
@@ -278,7 +278,6 @@ authenticate.error.generic = Er is iets misgegaan bij het verwerken van uw verzo
 
 reset.pw.forgot.title = Wachtwoord vergeten?
 reset.pw.forgot.submit.email = Typ je e-mail in en we sturen je een link om je wachtwoord opnieuw in te stellen.
-reset.pw.forgot.suggest = Als je problemen hebt met inloggen of het resetten van je wachtwoord, controleer dan of je naar de stad kijkt waar je je account hebt aangemaakt door naar de navigatiebalk rechtsboven op de pagina te kijken. Accounts zijn niet uitwisselbaar tussen verschillende steden, dus je moet voor elke stad een nieuw account aanmaken (je kunt dezelfde gebruikersnaam en hetzelfde wachtwoord gebruiken).
 
 reset.pw.email.hello = Hi {0},
 reset.pw.email.reset.title = Reset het wachtwoord van je Project Sidewalk-account
@@ -300,11 +299,10 @@ results.legend.high = Hoog
 results.legend.low = Laag
 results.legend.body = Grijze buurten hebben onvoldoende gegevens om trottoirproblemen te beoordelen. Klik op een buurt om bij te dragen. U kunt de gegevens zelf verkennen met behulp van <a href="/api" target="_blank">onze API's</a>!
 
-dashboard.no.org = Geen organisatie
-dashboard.edit.org = Bewerken
-dashboard.edit.info = Als je je organisatie niet ziet, stuur dan een e-mail naar <a id="email-link" href="mailto:sidewalk@cs.uw.edu" target="_blank">sidewalk@cs.uw .edu</a> en vermeld de naam en beschrijving van je organisatie.
-dashboard.orgs.unavailable = Er zijn geen beschikbare organisaties!
-dashboard.leave.org = Organisatie verlaten
+dashboard.current.team.greeting = Team: {0}
+dashboard.leave.team = Verlaat team: {0}
+dashboard.create.team = Creëer een team
+dashboard.join.team = Sluit je aan bij een team!
 dashboard.total.distance.explored = Totale afgelegde afstand
 dashboard.number.completed.missions = Aantal voltooide missies
 dashboard.number.of.labels = Aantal labels
@@ -328,6 +326,10 @@ dashboard.validation.badge = {0} validatiebadge
 dashboard.mistakes.header = Uw recente etiketteringsfouten
 dashboard.mistakes.tooltip = Dit zijn fouten zoals vastgesteld door andere gebruikers op de pagina Valideren. Soms gebeuren er fouten tijdens het valideren, en vaak zit er nuance in deze evaluaties.
 dashboard.mistakes.tooltip.alt = Vraagtekenpictogram voor handige tooltip.
+dashboard.team.title = Creëer een nieuw team
+dashboard.team.name = Teamnaam
+dashboard.team.description = Teambeschrijving (optioneel)
+dashboard.team.button = Maak een team
 
 labeling.guide.curb.ramp.summary = Een trottoir oprit is een korte oprit die tegen of door een stoeprand loopt. Een toegankelijke trottoir oprit biedt een toegankelijke route voor mensen met mobiliteitsbeperkingen om veilig van een stoep met hoge randen naar een rijbaan te gaan, en vice versa (<a href="https://www.ada.gov/pcatoolkit/chap6toolkit.htm">ADA</a>). Label elke stoepramp, ongeacht of er problemen zijn.
 labeling.guide.obstacle.summary = Obstakels zijn objecten die zich direct op het pad van een voetgangersroute bevinden, waardoor het pad wordt geblokkeerd. De ADA (Americans with Disabilities Act) vereist een "vrije vloer- of grondruimte" langs toegankelijke voetgangersroutes. Hierdoor kunnen voetgangers, vooral die met rollators of rolstoelen, veilig op het trottoir of zebrapad blijven. Van het pad afwijken om een obstakel te ontwijken kan onmogelijk zijn of kan leiden tot onbalans, struikelen of andere gevaren.
diff --git a/conf/messages.zh-TW b/conf/messages.zh-TW
index d58a57a5bc..3febb93532 100644
--- a/conf/messages.zh-TW
+++ b/conf/messages.zh-TW
@@ -79,6 +79,9 @@ city.name.walla-walla-wa = 瓦拉瓦拉
 city.name.st-louis-mo = 聖路易
 city.name.la-ca = 洛杉磯
 city.name.mendota-il = 門多塔
+city.name.knox = 諾克斯縣
+city.name.kaohsiung-tw = 高雄市
+city.name.taichung-tw = 臺中市
 
 state.name.oregon = 奧勒岡州
 state.name.dc = 特區
@@ -312,7 +315,6 @@ authenticate.error.generic = 處理您的要求時發生了錯誤。請確認您
 
 reset.pw.forgot.title = 忘記密碼了嗎？
 reset.pw.forgot.submit.email = 別擔心，輸入您的電子郵件，我們將寄送重設密碼的連結給您。
-reset.pw.forgot.suggest = 如果您在登錄或重設密碼時遇到問題，請查看頁面右上角的導航欄，來確認您是否正在檢視您設立帳戶的城市。不同城市之間的帳戶並不相通，因此您需要為每個城市設立一個新帳戶（您可以使用相同的用戶名/密碼）。
 
 reset.pw.email.hello = {0}您好,
 reset.pw.email.reset.title = 請重設您的Project Sidewalk密碼
@@ -334,11 +336,10 @@ results.legend.high = 高
 results.legend.low = 低
 results.legend.body = 當鄰里顯示灰色時，代表目前缺乏足夠的數據來評估人行道問題。請點擊任何一個鄰里協助標記！使用我們的<a href="/api" target="_blank">API</a>
 
-dashboard.no.org = 無組織
-dashboard.edit.org = 編輯
-dashboard.edit.info = 若您找不到您的組織，請email <a id="email-link" href="mailto:sidewalk@cs.uw.edu" target="_blank">sidewalk@cs.uw.edu</a> 並請提供您的組織名稱及簡介。
-dashboard.orgs.unavailable = 無適用之組織！
-dashboard.leave.org = 退出組織
+dashboard.current.team.greeting = 團隊: {0}
+dashboard.leave.team = 離開隊伍: {0}
+dashboard.create.team = 創建團隊
+dashboard.join.team = 加入團隊！
 dashboard.total.distance.explored = 探索距離
 dashboard.number.completed.missions = 完成任務的數量
 dashboard.number.of.labels = 標記數量
@@ -362,6 +363,10 @@ dashboard.validation.badge = {0} 檢核勳章
 dashboard.mistakes.header = 您最近的標記失誤
 dashboard.mistakes.tooltip = 這些是其他用戶從檢核任務中所判定的錯誤。有時其他用戶在檢核時也會犯錯，這些評估錯誤通常是由於細微的主觀判斷差異。
 dashboard.mistakes.tooltip.alt = 問號圖示顯示有用的工具提示框。
+dashboard.team.title = 創建一個新團隊
+dashboard.team.name = 隊名
+dashboard.team.description = 團隊描述（可選）
+dashboard.team.button = 創建團隊
 
 labeling.guide.curb.ramp.summary = 路緣斜坡是一個切入路緣或將道路路面和人行道連接的短坡道。無障礙路緣斜坡提供給行動不便的用路人一個通行的路徑，讓他們可以安全地在實體人行道及路面之間通行 (<a href="https://www.ada.gov/pcatoolkit/chap6toolkit.htm">ADA</a>). 每一個路緣坡道，無論是否有問題，都應該標記。
 labeling.guide.obstacle.summary = 「障礙物」是位於行人路徑上，直接阻擋通道的任何物體。 「美國身心障礙者法」（ADA）要求在無障礙路線上必須提供「清空的地板或地面空間」。這樣才可讓行人，尤其是助行器或輪椅使用者，安全地留在人行道或行人穿越道上。對於部分的用路人，為了避開障礙物而移離原路徑可能是無法做到的，或者可能導致站立不穩、跌倒或發生其他危險。
diff --git a/conf/routes b/conf/routes
index 69c8851e0f..e8be69e77c 100644
--- a/conf/routes
+++ b/conf/routes
@@ -77,6 +77,7 @@ GET     /adminapi/validationCounts                           @controllers.AdminC
 PUT     /adminapi/clearPlayCache                             @controllers.AdminController.clearPlayCache
 GET     /adminapi/updateUserStats                            @controllers.AdminController.updateUserStats(hoursCutoff: Option[Int])
 GET     /adminapi/getCoverageData                            @controllers.AdminController.getCoverageData
+GET     /adminapi/getUserStats                               @controllers.AdminController.getUserStats
 
 GET     /adminapi/webpageActivity                            @controllers.AdminController.getAllWebpageActivities
 GET     /adminapi/webpageActivity/:activity                  @controllers.AdminController.getWebpageActivities(activity: String)
@@ -152,6 +153,8 @@ POST    /userapi/logWebpageActivity                          @controllers.UserCo
 
 PUT    /userapi/setUserOrg/:orgId                            @controllers.UserProfileController.setUserOrg(orgId: Int)
 
+POST   /userapi/createTeam                                   @controllers.UserProfileController.createTeam
+
 # Access Feature and Access Score APIs
 GET     /v2/access/attributes                                @controllers.ProjectSidewalkAPIController.getAccessAttributesV2(lat1: Option[Double], lng1: Option[Double], lat2: Option[Double], lng2: Option[Double], severity: Option[String], filetype: Option[String], inline: Option[Boolean])
 GET     /v2/access/attributesWithLabels                      @controllers.ProjectSidewalkAPIController.getAccessAttributesWithLabelsV2(lat1: Option[Double], lng1: Option[Double], lat2: Option[Double], lng2: Option[Double], severity: Option[String], filetype: Option[String], inline: Option[Boolean])
diff --git a/db/Dockerfile b/db/Dockerfile
index 5e3b00520c..09b59488a3 100644
--- a/db/Dockerfile
+++ b/db/Dockerfile
@@ -2,6 +2,9 @@ FROM postgres:16.1-bullseye
 
 ENV DEBIAN_FRONTEND=noninteractive
 
+# Prevent PostgreSQL 17 installation
+RUN echo "Package: postgresql*\nPin: version 17.*\nPin-Priority: -1" > /etc/apt/preferences.d/postgresql
+
 RUN apt-get update && apt-get upgrade -y && \
     apt-get install -y postgresql-16-pgrouting gdal-bin postgis
 
diff --git a/db/init.sh b/db/init.sh
index 7a46a8c4d9..eaa853f83c 100755
--- a/db/init.sh
+++ b/db/init.sh
@@ -30,6 +30,7 @@ psql -v ON_ERROR_STOP=1 -U sidewalk -d sidewalk <<-EOSQL
     COMMENT ON EXTENSION postgis IS 'PostGIS geometry, geography, and raster spatial types and functions';
 EOSQL
 
+pg_restore -U sidewalk -Fc -d sidewalk /opt/sidewalk_init_users_dump
 pg_restore -U sidewalk -Fc -d sidewalk /opt/sidewalk_init_dump
 
 # Remove any password authentication on databases. This should be used for dev environment only.
diff --git a/db/sidewalk_init_dump b/db/sidewalk_init_dump
index 0affd47b48..82a9f54c8b 100644
Binary files a/db/sidewalk_init_dump and b/db/sidewalk_init_dump differ
diff --git a/db/sidewalk_init_users_dump b/db/sidewalk_init_users_dump
new file mode 100644
index 0000000000..a5747d8a2c
Binary files /dev/null and b/db/sidewalk_init_users_dump differ
diff --git a/package.json b/package.json
index ad2c164719..fd6dd5a720 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
         "grunt-concat": "grunt concat && grunt concat_css",
         "build": "npm install && grunt",
         "debug": "npm run grunt-concat && grunt watch & sbt -jvm-debug 9998 run",
-        "start": "npm run grunt-concat && grunt watch & sbt -Dsbt.ivy.home='.ivy2' -Dsbt.global.base='.sbt' -Dsbt.repository.config='.sbt/repositories' -mem 1536 compile \"~ run\" shell",
+        "start": "npm run grunt-concat && grunt watch & sbt -Dconfig.file=/home/conf/application.test.conf -Dsbt.ivy.home='.ivy2' -Dsbt.global.base='.sbt' -Dsbt.repository.config='.sbt/repositories' -mem 1536 compile \"~ run\" shell",
         "start-no-docker": "npm run grunt-concat && grunt watch & sbt -Dhttp.port=$SIDEWALK_HTTP_PORT -Dsbt.ivy.home='.ivy2' -Dsbt.global.base='.sbt' -Dsbt.repository.config='.sbt/repositories' $SBT_MEM_ARG compile \"~ run\" shell",
         "test": "grunt && grunt test"
     }
diff --git a/public/images/examples/tags/72.png b/public/images/examples/tags/72.png
new file mode 100644
index 0000000000..322ef95ed6
Binary files /dev/null and b/public/images/examples/tags/72.png differ
diff --git a/public/images/examples/tags/73.png b/public/images/examples/tags/73.png
new file mode 100644
index 0000000000..e0e217e432
Binary files /dev/null and b/public/images/examples/tags/73.png differ
diff --git a/public/images/examples/tags/74.png b/public/images/examples/tags/74.png
new file mode 100644
index 0000000000..3d3f844dd4
Binary files /dev/null and b/public/images/examples/tags/74.png differ
diff --git a/public/images/examples/tags/75.png b/public/images/examples/tags/75.png
new file mode 100644
index 0000000000..2c5b90d782
Binary files /dev/null and b/public/images/examples/tags/75.png differ
diff --git a/public/images/examples/tags/80.png b/public/images/examples/tags/80.png
new file mode 100644
index 0000000000..a692885f6e
Binary files /dev/null and b/public/images/examples/tags/80.png differ
diff --git a/public/javascripts/Admin/src/Admin.GSVLabelView.js b/public/javascripts/Admin/src/Admin.GSVLabelView.js
index ef95cf38e2..4c793ae65f 100644
--- a/public/javascripts/Admin/src/Admin.GSVLabelView.js
+++ b/public/javascripts/Admin/src/Admin.GSVLabelView.js
@@ -25,7 +25,7 @@ function AdminGSVLabelView(admin, source) {
                         '</div>' +
                         '<div class="modal-body">' +
                             '<div id="svholder" style="width: 540px; height:360px"></div>' +
-                            '<div id="validation-input-holder">' +
+                            '<div id="validation-input-holder" class="hidden">' +
                                 `<h3 style="margin: 0px; padding-top: 10px;">${i18next.t('labelmap:is-correct')}</h3>` +
                                 '<div id="validation-button-holder" style="padding-top: 10px;">' +
                                     '<button id="validation-agree-button" class="validation-button"' +
@@ -188,24 +188,40 @@ function AdminGSVLabelView(admin, source) {
         }
         self.prevAction = null;
 
-        self.agreeButton.click(function() {
-            if (self.prevAction !== "Agree") {
-                _disableValidationButtons();
-                _validateLabel("Agree");
-            }
-        });
-        self.disagreeButton.click(function() {
-            if (self.prevAction !== "Disagree") {
-                _disableValidationButtons();
-                _validateLabel("Disagree");
-            }
-        });
-        self.unsureButton.click(function() {
-            if (self.prevAction !== "Unsure") {
-                _disableValidationButtons();
-                _validateLabel("Unsure");
-            }
-        });
+        self.commentButton = self.modal.find("#comment-button");
+        self.commentTextArea = self.modal.find("#comment-textarea");
+
+        if (self.source !== "UserMap") {
+            self.modal.find('#validation-input-holder').removeClass('hidden');
+            self.agreeButton.click(function () {
+                if (self.prevAction !== "Agree") {
+                    _disableValidationButtons();
+                    _validateLabel("Agree");
+                }
+            });
+            self.disagreeButton.click(function () {
+                if (self.prevAction !== "Disagree") {
+                    _disableValidationButtons();
+                    _validateLabel("Disagree");
+                }
+            });
+            self.unsureButton.click(function () {
+                if (self.prevAction !== "Unsure") {
+                    _disableValidationButtons();
+                    _validateLabel("Unsure");
+                }
+            });
+
+            self.commentButton.popover({
+                template: '<div class="feedback-popover" role="tooltip"><div class="arrow"></div><div class="popover-content"></div></div>'
+            });
+            self.commentButton.click(function () {
+                var comment = self.commentTextArea.val();
+                if (comment) {
+                    _submitComment(comment);
+                }
+            });
+        }
 
         self.lowQualityButton.click(function() {
             _setFlag("low_quality", !self.flags["low_quality"]);
@@ -217,18 +233,6 @@ function AdminGSVLabelView(admin, source) {
             _setFlag("stale", !self.flags["stale"]);
         });
 
-        self.commentButton = self.modal.find("#comment-button");
-        self.commentTextArea = self.modal.find("#comment-textarea");
-        self.commentButton.popover({
-            template : '<div class="feedback-popover" role="tooltip"><div class="arrow"></div><div class="popover-content"></div></div>'
-        });
-        self.commentButton.click(function() {
-            var comment = self.commentTextArea.val();
-            if (comment) {
-                _submitComment(comment);
-            }
-        });
-
         self.modalTitle = self.modal.find("#myModalLabel");
         self.modalTimestamp = self.modal.find("#timestamp");
         self.modalLabelTypeValue = self.modal.find("#label-type-value");
@@ -561,7 +565,7 @@ function AdminGSVLabelView(admin, source) {
         self.modalSeverity.html(labelMetadata['severity'] != null ? labelMetadata['severity'] : "No severity");
         self.modalTemporary.html(labelMetadata['temporary'] ? i18next.t('common:yes'): i18next.t('common:no'));
         // Create a list of translated tags that's parsable by i18next.
-        var translatedTags = labelMetadata['tags'].map(tag => i18next.t(`common:tag.${tag}`));
+        var translatedTags = labelMetadata['tags'].map(tag => i18next.t(`common:tag.${tag.replace(/:/g, '-')}`));
         self.modalTags.html(translatedTags.join(', ')); // Join to format using commas and spaces.
         self.modalDescription.text(labelMetadata['description'] != null ? labelMetadata['description'] : i18next.t('common:no-description'));
         self.modalTimestamp.html(labelDate.format('LL, LT') + " (" + labelDate.fromNow() + ")");
diff --git a/public/javascripts/Admin/src/Admin.User.js b/public/javascripts/Admin/src/Admin.User.js
index b8d528403c..20246c6be4 100644
--- a/public/javascripts/Admin/src/Admin.User.js
+++ b/public/javascripts/Admin/src/Admin.User.js
@@ -15,9 +15,13 @@ function AdminUser(user, userId, serviceHoursUser) {
         popupLabelViewer: AdminGSVLabelView(true, "AdminUserDashboard"),
         includeLabelCounts: true
     };
+    var self = {};
     CreatePSMap($, params).then(m => {
-        window.map = m[0];
+        self.map = m[0];
+        self.mapData = m[3];
+        addLegendListeners(self.map, self.mapData);
     });
+    window.map = self;
     
     $.getJSON('/adminapi/tasks/' + encodeURI(user), function (data) {
         var grouped = _.groupBy(data, function (o) { return o.audit_task_id});
@@ -180,5 +184,15 @@ function AdminUser(user, userId, serviceHoursUser) {
         });
     }
 
+    function addLegendListeners(map, mapData) {
+        // Add listeners on the checkboxes.
+        $('#map-label-legend tr input[type="checkbox"]').each(function () {
+            $(this).on('click', () => {
+                filterLabelLayers(this, map, mapData, false);
+            });
+            this.disabled = false; // Enable the checkbox now that the map has loaded.
+        });
+    }
+
     return self;
 }
diff --git a/public/javascripts/Admin/src/Admin.js b/public/javascripts/Admin/src/Admin.js
index 808a068445..7117c6c030 100644
--- a/public/javascripts/Admin/src/Admin.js
+++ b/public/javascripts/Admin/src/Admin.js
@@ -2,6 +2,7 @@ function Admin(_, $) {
     var self = {};
     var mapLoaded = false;
     var graphsLoaded = false;
+    var usersLoaded = false;
     var analyticsTabMapParams = {
         mapName: 'admin-landing-choropleth',
         mapStyle: 'mapbox://styles/mapbox/light-v11?optimize=true',
@@ -35,7 +36,8 @@ function Admin(_, $) {
     // Constructor: load street edge data from the backend & make the loader finish after that data loads.
     function _init() {
         loadStreetEdgeData().then(function() {
-            $('.loader').fadeOut('slow');
+            $('#page-loading').css('visibility', 'hidden');
+            $('#admin-page-container').css('visibility', 'visible');
         }).catch(function(error) {
             console.error("Error loading street edge data:", error);
         });
@@ -189,7 +191,7 @@ function Admin(_, $) {
     }
 
     $('.nav-pills').on('click', function (e) {
-        if (e.target.id == "visualization" && mapLoaded == false) {
+        if (e.target.id === "visualization" && mapLoaded === false) {
             CreatePSMap($, mapTabMapParams).then(m => {
                 self.map = m[0];
                 self.mapData = m[3];
@@ -209,7 +211,7 @@ function Admin(_, $) {
                             }
                             toggleLabelLayer(checkbox.id.split('-')[0], checkbox, slider, map, mapData);
                         } else if (checkbox.getAttribute('data-filter-type') === 'label-validations') {
-                            filterLabelLayers(checkbox, map, mapData);
+                            filterLabelLayers(checkbox, map, mapData, true);
                         } else {
                             filterStreetLayer(map);
                         }
@@ -242,7 +244,7 @@ function Admin(_, $) {
                 });
             }
         }
-        else if (e.target.id == "analytics" && graphsLoaded == false) {
+        else if (e.target.id === "analytics" && graphsLoaded === false) {
 
             // Create the choropleth.
             CreatePSMap($, analyticsTabMapParams).then(m => {
@@ -1088,6 +1090,17 @@ function Admin(_, $) {
             });
             graphsLoaded = true;
         }
+        else if (e.target.id === "users" && usersLoaded === false) {
+            $('#tabs-5').css('visibility', 'hidden');
+            $('#page-loading').css('visibility', 'visible');
+            loadUserStats().then(function() {
+                usersLoaded = true;
+                $('#page-loading').css('visibility', 'hidden');
+                $('#tabs-5').css('visibility', 'visible');
+            }).catch(function(error) {
+                console.error("Error loading users:", error);
+            });
+        }
     });
 
     function changeRole(e) {
@@ -1238,6 +1251,85 @@ function Admin(_, $) {
             })
         });
     }
+
+    function loadUserStats() {
+        return new Promise((resolve, reject) => {
+            $.getJSON("/adminapi/getUserStats", function (data) {
+                const tableBody = $("#user-stats-table-body");
+                tableBody.empty();
+    
+                data.user_stats.forEach((u) => {
+                    const roleDropdown = u.role !== "Owner" ? `
+                        <div class="dropdown role-dropdown">
+                            <button class="btn btn-default dropdown-toggle" type="button" id="userRoleDropdown${u.userId}" data-toggle="dropdown">
+                                ${u.role}
+                                <span class="caret"></span>
+                            </button>
+                            <ul class="dropdown-menu" role="menu" aria-labelledby="userRoleDropdown${u.userId}">
+                                <li><a href="#!" class="change-role">Registered</a></li>
+                                <li><a href="#!" class="change-role">Turker</a></li>
+                                <li><a href="#!" class="change-role">Researcher</a></li>
+                                <li><a href="#!" class="change-role">Administrator</a></li>
+                                <li><a href="#!" class="change-role">Anonymous</a></li>
+                            </ul>
+                        </div>
+                    ` : u.role;
+    
+                    const orgDropdown = `
+                        <div class="dropdown org-dropdown">
+                            <button class="btn btn-default dropdown-toggle" type="button" id="userOrgDropdown${u.userId}" data-toggle="dropdown">
+                                ${u.org || "None"}
+                                <span class="caret"></span>
+                            </button>
+                            <ul class="dropdown-menu" role="menu" aria-labelledby="userOrgDropdown${u.userId}">
+                                ${data.organizations.map(org => `
+                                    <li><a href="#!" class="change-org" data-org-id="${org.orgId}">${org.orgName}</a></li>
+                                `).join('')}
+                                <li><a href="#!" class="change-org" data-org-id="-1">None</a></li>
+                            </ul>
+                        </div>
+                    `;
+
+                    const signUpTime = u.signUpTime ? new Date(u.signUpTime) : "";
+                    const lastSignInTime = u.lastSignInTime ? new Date(u.lastSignInTime) : "";
+    
+                    const userRow = `
+                        <tr>
+                            <td><a href='/admin/userProfile/${u.username}'>${u.username}</a></td>
+                            <td>${u.userId}</td>
+                            <td>${u.email}</td>
+                            <td>${roleDropdown}</td>
+                            <td>${orgDropdown}</td>
+                            <td>${u.highQuality}</td>
+                            <td>${u.labels}</td>
+                            <td>${u.ownValidated}</td>
+                            <td>${(u.ownValidatedAgreedPct * 100).toFixed(0)}%</td>
+                            <td>${u.othersValidated}</td>
+                            <td>${(u.othersValidatedAgreedPct * 100).toFixed(0)}%</td>
+                            <td class='timestamp'>${signUpTime}</td>
+                            <td class='timestamp'>${lastSignInTime}</td>
+                            <td>${u.signInCount}</td>
+                        </tr>
+                    `;
+    
+                    tableBody.append(userRow);
+                });
+
+                // Format the table.
+                $('#user-table').dataTable();
+                updateTimestamps(i18next.language);
+
+                // Add listeners to update role or org from dropdown.
+                $('.role-dropdown').on('click', 'a', changeRole);
+                $('.org-dropdown').on('click', 'a', changeOrg);
+    
+                resolve();
+            }).fail(error => {
+                console.error("Failed to load user stats", error);
+                reject(error);
+            });
+        });
+    }
     
 
     initializeLabelTable();
@@ -1248,9 +1340,7 @@ function Admin(_, $) {
     
     self.clearPlayCache = clearPlayCache;
     self.loadStreetEdgeData = loadStreetEdgeData;
-
-    $('.role-dropdown').on('click', 'a', changeRole);
-    $('.org-dropdown').on('click', 'a', changeOrg);
+    self.loadUserStats = loadUserStats;
 
     _init();
     return self;
diff --git a/public/javascripts/Gallery/src/filter/Tag.js b/public/javascripts/Gallery/src/filter/Tag.js
index e05fc580b8..98feef7d37 100644
--- a/public/javascripts/Gallery/src/filter/Tag.js
+++ b/public/javascripts/Gallery/src/filter/Tag.js
@@ -35,7 +35,7 @@ function Tag (params, applied) {
         tagElement = document.createElement('button');
         tagElement.className = "gallery-tag gallery-filter-button gallery-filter";
         tagElement.id = properties.tag;
-        tagElement.innerText = i18next.t('tag.' + properties.tag);
+        tagElement.innerText = i18next.t('tag.' + properties.tag.replace(/:/g, '-'));
         tagElement.disabled = true; // Will be enabled once images load.
 
         if (status.applied) {
diff --git a/public/javascripts/PSMap/AddLabelsToMap.js b/public/javascripts/PSMap/AddLabelsToMap.js
index 347bba3840..910c43b3f3 100644
--- a/public/javascripts/PSMap/AddLabelsToMap.js
+++ b/public/javascripts/PSMap/AddLabelsToMap.js
@@ -54,8 +54,8 @@ function AddLabelsToMap(map, labelData, params) {
         document.getElementById('td-number-of-signals').innerHTML =
             mapData.sortedLabels['Signal'].map(l => l.length).reduce((acc, len) => acc + len, 0);
     } else {
-        // For LabelMap. Set up the initial set of filters.
-        filterLabelLayers('incorrect', map, mapData);
+        // Set up the initial set of filters.
+        filterLabelLayers('incorrect', map, mapData, true);
     }
 
     // Set up the label hover and popup functionality.
diff --git a/public/javascripts/PSMap/PSMapUtilities.js b/public/javascripts/PSMap/PSMapUtilities.js
index 03ba40c494..73bac982ac 100644
--- a/public/javascripts/PSMap/PSMapUtilities.js
+++ b/public/javascripts/PSMap/PSMapUtilities.js
@@ -39,13 +39,13 @@ function toggleLabelLayer(labelType, checkbox, slider, map, mapData) {
  * @param map The Mapbox map object.
  * @param mapData
  */
-function filterLabelLayers(checkbox, map, mapData) {
+function filterLabelLayers(checkbox, map, mapData, highQualityFilter) {
     if (checkbox) mapData[checkbox.id] = checkbox.checked;
     Object.keys(mapData.layerNames).forEach(function (key) {
         for (let i = 0; i < mapData.layerNames[key].length; i++) {
-            map.setFilter(mapData.layerNames[key][i], [
+            // Create the base filter.
+            let filter = [
                 'all',
-                ['any', mapData.lowQualityUsers, ['==', ['get', 'high_quality_user'], true]],
                 [
                     'any',
                     ['all', mapData.correct, ['==', ['get', 'correct'], true]],
@@ -53,7 +53,15 @@ function filterLabelLayers(checkbox, map, mapData) {
                     ['all', mapData.unsure, ['==', ['get', 'correct'], null], ['==', ['get', 'has_validations'], true]],
                     ['all', mapData.unvalidated, ['==', ['get', 'correct'], null], ['==', ['get', 'has_validations'], false]]
                 ]
-            ]);
+            ];
+
+            // Conditionally add the highQualityFilter on LabelMap.
+            if (highQualityFilter) {
+                filter.push(['any', mapData.lowQualityUsers, ['==', ['get', 'high_quality_user'], true]]);
+            }
+
+            // Apply the filter to the map layer.
+            map.setFilter(mapData.layerNames[key][i], filter);
         }
     });
 }
diff --git a/public/javascripts/Progress/src/Progress.js b/public/javascripts/Progress/src/Progress.js
index 01391af11d..ec2ca0160a 100644
--- a/public/javascripts/Progress/src/Progress.js
+++ b/public/javascripts/Progress/src/Progress.js
@@ -12,13 +12,17 @@ function Progress (_, $, userRole) {
         neighborhoodTooltip: 'completionRate',
         neighborhoodFillColor: '#5d6d6b',
         neighborhoodFillOpacity: 0.1,
+        popupLabelViewer: AdminGSVLabelView(false, "UserMap"),
         includeLabelCounts: true
     };
+    var self = {}
     CreatePSMap($, params).then(m => {
-        window.map = m[0];
-        setRegionFocus(window.map);
+        self.map = m[0];
+        self.mapData = m[3];
+        setRegionFocus(self.map);
+        addLegendListeners(self.map, self.mapData);
     });
-
+    window.map = self;
     // Get total reward if a turker.
     if (userRole === 'Turker') {
         $.ajax({
@@ -51,24 +55,48 @@ function Progress (_, $, userRole) {
         });
     }
 
-    function putUserOrg(e) {
+    function putUserTeam(e, newTeam) {
         var parsedId = $(this).attr('id').split("-"); // the id comes in the form of "from-startOrg-to-endOrg"
-        var startOrg = parsedId[1];
-        var endOrg = parsedId[3];
+        var startTeam = parsedId[1];
+        var endTeam = newTeam ? newTeam : parsedId[3];
         $.ajax({
             async: true,
-            url: '/userapi/setUserOrg/' + endOrg,
+            url: '/userapi/setUserOrg/' + endTeam,
             type: 'put',
             success: function (result) {
-                window.location.reload();
-                if (endOrg != startOrg) {
-                    if (startOrg != 0) {
-                        logWebpageActivity("Click_module=leaving_org=" + startOrg);
-                    }
-                    if (endOrg != 0) {
-                        logWebpageActivity("Click_module=joining_org=" + endOrg);
-                    }
+                if (startTeam && startTeam !== "0") {
+                    logWebpageActivity("Click_module=leaving_team=" + startTeam);
+                }
+                if (endTeam && endTeam !== "0") {
+                    logWebpageActivity("Click_module=joining_team=" + endTeam);
                 }
+                window.location.reload();
+            },
+            error: function (result) {
+                console.error("Error logging activity:", result);
+            }
+        });
+    }
+
+    // function to call endpoint and create team
+    function createTeam() {
+        var orgName = util.escapeHTML($('#team-name-input').val());
+        var orgDescription = util.escapeHTML($('#team-description-input').val());
+        
+        $.ajax({
+            async: true,
+            url: '/userapi/createTeam', 
+            type: 'post',
+            contentType: 'application/json',
+            data: JSON.stringify({
+                name: orgName,
+                description: orgDescription
+            }),
+            success: function (result) {
+                var newTeam = result.org_id;
+                var userOrgElement = $('.put-user-org')[0];
+                logWebpageActivity("Click_module=create_team=team_id=" + newTeam);
+                putUserTeam.call(userOrgElement || { id: "-1" }, null, newTeam);
             },
             error: function (result) {
                 console.error(result);
@@ -76,5 +104,16 @@ function Progress (_, $, userRole) {
         });
     }
 
-    $('.put-user-org').on('click', putUserOrg);
+    function addLegendListeners(map, mapData) {
+        // Add listeners on the checkboxes.
+        $('#map-label-legend tr input[type="checkbox"]').each(function () {
+            $(this).on('click', () => {
+                filterLabelLayers(this, map, mapData, false);
+            });
+            this.disabled = false; // Enable the checkbox now that the map has loaded.
+        });
+    }
+
+    $('.put-user-org').on('click', putUserTeam);
+    $('#save-team-button').on('click', createTeam);
 }
diff --git a/public/javascripts/SVValidate/src/label/LabelDescriptionBox.js b/public/javascripts/SVValidate/src/label/LabelDescriptionBox.js
index f09b031c52..44275685b2 100644
--- a/public/javascripts/SVValidate/src/label/LabelDescriptionBox.js
+++ b/public/javascripts/SVValidate/src/label/LabelDescriptionBox.js
@@ -45,7 +45,7 @@ function LabelDescriptionBox () {
 
         if (tags && tags.length > 0) {
             // Translate to correct language and separate tags with a comma.
-            let tag = tags.map(t => i18next.t('common:tag.' + t)).join(', ');
+            let tag = tags.map(t => i18next.t('common:tag.' + t.replace(/:/g, '-'))).join(', ');
             let htmlString = document.createTextNode(i18next.t('common:tags') + ": " + tag);
             desBox.appendChild(htmlString);
             desBox.appendChild(document.createElement("br"));
diff --git a/public/javascripts/SVValidate/src/menu/RightMenu.js b/public/javascripts/SVValidate/src/menu/RightMenu.js
index 1fe27ca3ef..6ac89016f2 100644
--- a/public/javascripts/SVValidate/src/menu/RightMenu.js
+++ b/public/javascripts/SVValidate/src/menu/RightMenu.js
@@ -71,7 +71,7 @@ function RightMenu(menuUI) {
             render: {
                 option: function(item, escape) {
                     // Add an example image tooltip to the tag.
-                    const translatedTagName = i18next.t('common:tag.' + item.tag_name);
+                    const translatedTagName = i18next.t('common:tag.' + item.tag_name.replace(/:/g, '-'));
                     let $tagDiv = $(`<div class="option">${escape(translatedTagName)}</div>`);
                     const tooltipText = `"${translatedTagName}" example`
                     _addTooltip($tagDiv, tooltipText, `/assets/images/examples/tags/${item.tag_id}.png`);
@@ -286,7 +286,7 @@ function RightMenu(menuUI) {
             $tagDiv.data('tag-id', allTagOptions.find(t => t.tag_name === tag).tag_id);
 
             // Update the tag name.
-            const translatedTagName = i18next.t('common:tag.' + tag);
+            const translatedTagName = i18next.t('common:tag.' + tag.replace(/:/g, '-'));
             $tagDiv.children('.tag-name').text(translatedTagName);
 
             // Add the removal onclick function.
diff --git a/public/javascripts/common/UtilitiesSidewalk.js b/public/javascripts/common/UtilitiesSidewalk.js
index 642c05a760..dece64911c 100644
--- a/public/javascripts/common/UtilitiesSidewalk.js
+++ b/public/javascripts/common/UtilitiesSidewalk.js
@@ -112,6 +112,10 @@ function UtilitiesMisc (JSON) {
                     'parallel lines': {
                         keyChar: 'J',
                         text: i18next.t('center-ui.context-menu.tag.parallel-lines')
+                    },
+                    'not aligned with crosswalk': {
+                        keyChar: 'G',
+                        text: i18next.t('center-ui.context-menu.tag.not-aligned-with-crosswalk')
                     }
                 }
             },
@@ -208,6 +212,10 @@ function UtilitiesMisc (JSON) {
                     'mailbox': {
                         keyChar: '[',
                         text: i18next.t('center-ui.context-menu.tag.mailbox')
+                    },
+                    'utility cabinet' : {
+                        keyChar: ']',
+                        text: i18next.t('center-ui.context-menu.tag.utility-cabinet')
                     }
                 }
             },
@@ -389,6 +397,34 @@ function UtilitiesMisc (JSON) {
                     'no bus stop access': {
                         keyChar: 'A',
                         text: i18next.t('center-ui.context-menu.tag.no-bus-stop-access')
+                    },
+                    'cycle lane: protection from traffic': {
+                        keyChar: 'E',
+                        text: i18next.t('center-ui.context-menu.tag.cycle-lane-protection-from-traffic')
+                    },
+                    'cycle lane: no protection from traffic': {
+                        keyChar: 'T',
+                        text: i18next.t('center-ui.context-menu.tag.cycle-lane-no-protection-from-traffic')
+                    },
+                    'cycle lane: surface problem': {
+                        keyChar: 'R',
+                        text: i18next.t('center-ui.context-menu.tag.cycle-lane-surface-problem')
+                    },
+                    'cycle lane: faded paint': {
+                        keyChar: 'F',
+                        text: i18next.t('center-ui.context-menu.tag.cycle-lane-faded-paint')
+                    },
+                    'cycle lane: debris / pooled water': {
+                        keyChar: 'D',
+                        text: i18next.t('center-ui.context-menu.tag.cycle-lane-debris-pooled-water')
+                    },
+                    'cycle lane: parked car': {
+                        keyChar: 'U',
+                        text: i18next.t('center-ui.context-menu.tag.cycle-lane-parked-car')
+                    },
+                    'cycle box': {
+                        keyChar: 'X',
+                        text: i18next.t('center-ui.context-menu.tag.cycle-box')
                     }
                 }
             },
diff --git a/public/locales/de/audit.json b/public/locales/de/audit.json
index 402463dd67..b2fcaed0d6 100644
--- a/public/locales/de/audit.json
+++ b/public/locales/de/audit.json
@@ -176,7 +176,16 @@
                 "utility-panel": "Schaltkast<tag-underline>e</tag-underline>n",
                 "outdoor-dining-area": "Aussenbereich Gastronomie (<tag-underline>q</tag-underline>)",
                 "mailbox": "Briefkasten (<tag-underline>[</tag-underline>)",
-                "debris": "Trümmer (<tag-underline>f</tag-underline>)"
+                "debris": "Trümmer (<tag-underline>f</tag-underline>)",
+                "not-aligned-with-crosswalk": "nicht auf den Zebrastreifen aus<tag-underline>g</tag-underline>erichtet",
+                "utility-cabinet": "Hauswirtschaftsschrank (<tag-underline>]</tag-underline>)",
+                "cycle-lane-protection-from-traffic": "Radweg: Schutz vor V<tag-underline>e</tag-underline>rkehr",
+                "cycle-lane-no-protection-from-traffic": "Radweg: kein Schu<tag-underline>t</tag-underline>z vor Verkehr",
+                "cycle-lane-surface-problem": "Radweg: $t(audit:center-ui.context-menu.tag.surface-problem)",
+                "cycle-lane-faded-paint": "Radweg: $t(audit:center-ui.context-menu.tag.paint-fading)",
+                "cycle-lane-debris-pooled-water": "Ra<tag-underline>d</tag-underline>weg: Schmutz/Wasserpfütze",
+                "cycle-lane-parked-car": "Radweg: $t(audit:center-ui.context-menu.tag.parked-car)",
+                "cycle-box": "Fahrradbo<tag-underline>x</tag-underline>"
             },
             "tooltip": {
                 "passable": "Passierbar",
diff --git a/public/locales/de/common.json b/public/locales/de/common.json
index 13b984d200..2d37ba3a89 100644
--- a/public/locales/de/common.json
+++ b/public/locales/de/common.json
@@ -123,7 +123,16 @@
         "utility panel": "Schaltkasten",
         "outdoor dining area": "Aussenbereich Gastronomie",
         "mailbox": "Briefkasten",
-        "debris": "Trümmer"
+        "debris": "Trümmer",
+        "not aligned with crosswalk": "nicht auf den Zebrastreifen ausgerichtet",
+        "utility cabinet": "Hauswirtschaftsschrank",
+        "cycle lane- protection from traffic": "Radweg: Schutz vor Verkehr",
+        "cycle lane- no protection from traffic": "Radweg: kein Schutz vor Verkehr",
+        "cycle lane- surface problem": "Radweg: $t(common:tag.surface problem)",
+        "cycle lane- faded paint": "Radweg: $t(common:tag.paint fading)",
+        "cycle lane- debris / pooled water": "Radweg: $t(common:tag.debris / pooled water)",
+        "cycle lane- parked car": "Radweg: $t(common:tag.parked car)",
+        "cycle box": "Fahrradbox"
     },
     "gsv-info": {
         "details-title": "Details",
diff --git a/public/locales/en/audit.json b/public/locales/en/audit.json
index ad71838a8c..846d4fdd63 100644
--- a/public/locales/en/audit.json
+++ b/public/locales/en/audit.json
@@ -176,7 +176,16 @@
                 "utility-panel": "utility pan<tag-underline>e</tag-underline>l",
                 "outdoor-dining-area": "outdoor dining area (<tag-underline>q</tag-underline>)",
                 "mailbox": "mailbox (<tag-underline>[</tag-underline>)",
-                "debris": "debris (<tag-underline>f</tag-underline>)"
+                "debris": "debris (<tag-underline>f</tag-underline>)",
+                "not-aligned-with-crosswalk": "not ali<tag-underline>g</tag-underline>ned with crosswalk",
+                "utility-cabinet": "utility cabinet (<tag-underline>]</tag-underline>)",
+                "cycle-lane-protection-from-traffic": "cycle lane: prot<tag-underline>e</tag-underline>ction from traffic",
+                "cycle-lane-no-protection-from-traffic": "cycle lane: no protection from <tag-underline>t</tag-underline>raffic",
+                "cycle-lane-surface-problem": "cycle lane: su<tag-underline>r</tag-underline>face problem",
+                "cycle-lane-faded-paint": "cycle lane: <tag-underline>f</tag-underline>aded paint",
+                "cycle-lane-debris-pooled-water": "cycle lane: <tag-underline>d</tag-underline>ebris / pooled water",
+                "cycle-lane-parked-car": "cycle lane: parked car (<tag-underline>u</tag-underline>)",
+                "cycle-box": "cycle bo<tag-underline>x</tag-underline>"
             },
             "tooltip": {
                 "passable": "Passable",
diff --git a/public/locales/en/common.json b/public/locales/en/common.json
index 7586344344..eaab843962 100644
--- a/public/locales/en/common.json
+++ b/public/locales/en/common.json
@@ -123,7 +123,16 @@
         "utility panel": "utility panel",
         "outdoor dining area": "outdoor dining area",
         "mailbox": "mailbox",
-        "debris": "debris"
+        "debris": "debris",
+        "not aligned with crosswalk": "not aligned with crosswalk",
+        "utility cabinet": "utility cabinet",
+        "cycle lane- protection from traffic": "cycle lane: protection from traffic",
+        "cycle lane- no protection from traffic": "cycle lane: no protection from traffic",
+        "cycle lane- surface problem": "cycle lane: surface problem",
+        "cycle lane- faded paint": "cycle lane: faded paint",
+        "cycle lane- debris / pooled water": "cycle lane: debris / pooled water",
+        "cycle lane- parked car": "cycle lane: parked car",
+        "cycle box": "cycle box"
     },
     "gsv-info": {
         "details-title": "Details",
diff --git a/public/locales/es/audit.json b/public/locales/es/audit.json
index 1512b4c13e..179bf7538f 100644
--- a/public/locales/es/audit.json
+++ b/public/locales/es/audit.json
@@ -176,7 +176,16 @@
                 "utility-panel": "pan<tag-underline>e</tag-underline>l de utilidad",
                 "outdoor-dining-area": "comedor al aire libre (<tag-underline>q</tag-underline>)",
                 "mailbox": "buzón (<tag-underline>[</tag-underline>)",
-                "debris": "escombros (<tag-underline>f</tag-underline>)"
+                "debris": "escombros (<tag-underline>f</tag-underline>)",
+                "not-aligned-with-crosswalk": "no alineado con el cruce peatonal (<tag-underline>g</tag-underline>)",
+                "utility-cabinet": "gabinete de utilidad (<tag-underline>]</tag-underline>)",
+                "cycle-lane-protection-from-traffic": "carril bici: prot<tag-underline>e</tag-underline>cción del tráfico",
+                "cycle-lane-no-protection-from-traffic": "carril bici: sin protección del <tag-underline>t</tag-underline>ráfico",
+                "cycle-lane-surface-problem": "carril bici: $t(audit:center-ui.context-menu.tag.surface-problem)",
+                "cycle-lane-faded-paint": "carril bici: $t(audit:center-ui.context-menu.tag.paint-fading)",
+                "cycle-lane-debris-pooled-water": "carril bici: $t(audit:center-ui.context-menu.tag.debris-pooled-water)",
+                "cycle-lane-parked-car": "carril bici: $t(audit:center-ui.context-menu.tag.parked-car)",
+                "cycle-box": "caja de ciclo (<tag-underline>x</tag-underline>)"
             },
             "tooltip": {
                 "passable": "Transitable",
diff --git a/public/locales/es/common.json b/public/locales/es/common.json
index 4c152b50bc..ec17da872e 100644
--- a/public/locales/es/common.json
+++ b/public/locales/es/common.json
@@ -68,7 +68,7 @@
         "steep": "empinada (mucha pendiente)",
         "not enough landing space": "área de aproximación insuficiente",
         "not level with street": "con desnivel",
-        "surface-problem": "problema en superficie",
+        "surface problem": "problema en superficie",
         "debris / pooled water": "escombros/encharcada",
         "parallel lines": "lineas paralelas",
         "alternate route present": "hay una ruta alternativa segura para cruzar",
@@ -123,7 +123,16 @@
         "utility panel": "panel de utilidad",
         "outdoor dining area": "comedor al aire libre",
         "mailbox": "buzón",
-        "debris": "escombros"
+        "debris": "escombros",
+        "not aligned with crosswalk": "no alineado con el cruce peatonal",
+        "utility cabinet": "gabinete de utilidad",
+        "cycle lane- protection from traffic": "carril bici: protección del tráfico",
+        "cycle lane- no protection from traffic": "carril bici: sin protección del tráfico",
+        "cycle lane- surface problem": "carril bici: $t(common:tag.surface problem)",
+        "cycle lane- faded paint": "carril bici: $t(common:tag.paint fading)",
+        "cycle lane- debris / pooled water": "carril bici: $t(common:tag.debris / pooled water)",
+        "cycle lane- parked car": "carril bici: $t(common:tag.parked car)",
+        "cycle box": "caja de ciclo"
     },
     "gsv-info": {
         "details-title": "Detalles",
diff --git a/public/locales/nl/audit.json b/public/locales/nl/audit.json
index 876aecf79c..ba5745847e 100644
--- a/public/locales/nl/audit.json
+++ b/public/locales/nl/audit.json
@@ -176,7 +176,16 @@
                 "utility-panel": "hulpprogramma pan<tag-underline>e</tag-underline>el",
                 "outdoor-dining-area": "buiten eetgedeelte (<tag-underline>q</tag-underline>)",
                 "mailbox": "postbus (<tag-underline>[</tag-underline>)",
-                "debris": "brokstukken (<tag-underline>f</tag-underline>)"
+                "debris": "brokstukken (<tag-underline>f</tag-underline>)",
+                "not-aligned-with-crosswalk": "niet uit<tag-underline>g</tag-underline>elijnd met oversteekplaats",
+                "utility-cabinet": "nutskast (<tag-underline>]</tag-underline>)",
+                "cycle-lane-protection-from-traffic": "fietspad: b<tag-underline>e</tag-underline>scherming tegen verkeer",
+                "cycle-lane-no-protection-from-traffic": "fietspad: geen bescherming <tag-underline>t</tag-underline>egen verkeer",
+                "cycle-lane-surface-problem": "fietspad: $t(audit:center-ui.context-menu.tag.surface-problem)",
+                "cycle-lane-faded-paint": "fietspad: $t(audit:center-ui.context-menu.tag.paint-fading)",
+                "cycle-lane-debris-pooled-water": "fietspad: $t(audit:center-ui.context-menu.tag.debris-pooled-water)",
+                "cycle-lane-parked-car": "fietspad: $t(audit:center-ui.context-menu.tag.parked-car)",
+                "cycle-box": "cyclus doos (<tag-underline>x</tag-underline>)"
             },
             "tooltip": {
                 "passable": "Begaanbaar",
diff --git a/public/locales/nl/common.json b/public/locales/nl/common.json
index 6e36dfe1e3..0a2b8ad685 100644
--- a/public/locales/nl/common.json
+++ b/public/locales/nl/common.json
@@ -67,7 +67,7 @@
         "steep": "steil",
         "not enough landing space": "bovenaan niet genoeg ruimte",
         "not level with street": "niet zelfde niveau met straat",
-        "surface-problem": "oppervlakte probleem",
+        "surface problem": "oppervlakte probleem",
         "debris / pooled water": "brokstukken / gepoold water",
         "parallel lines": "parallelle lijnen",
         "alternate route present": "alternatieve route aanwezig",
@@ -122,7 +122,16 @@
         "utility panel": "hulpprogramma paneel",
         "outdoor dining area": "buiten eetgedeelte",
         "mailbox": "postbus",
-        "debris": "brokstukken"
+        "debris": "brokstukken",
+        "not aligned with crosswalk": "niet uitgelijnd met oversteekplaats",
+        "utility cabinet": "nutskast",
+        "cycle lane- protection from traffic": "fietspad: bescherming tegen verkeer",
+        "cycle lane- no protection from traffic": "fietspad: geen bescherming tegen verkeer",
+        "cycle lane- surface problem": "fietspad: $t(common:tag.surface problem)",
+        "cycle lane- faded paint": "fietspad: $t(common:tag.paint fading)",
+        "cycle lane- debris / pooled water": "fietspad: $t(common:tag.debris / pooled water)",
+        "cycle lane- parked car": "fietspad: $t(common:tag.parked car)",
+        "cycle box": "cyclus doos"
     },
     "gsv-info": {
         "details-title": "Details",
diff --git a/public/locales/zh-TW/audit.json b/public/locales/zh-TW/audit.json
index a09f28fc1b..848b284186 100644
--- a/public/locales/zh-TW/audit.json
+++ b/public/locales/zh-TW/audit.json
@@ -176,7 +176,16 @@
                 "utility-panel": "公用設施面板(<tag-underline>e</tag-underline>)",
                 "outdoor-dining-area": "戶外用餐區(<tag-underline>q</tag-underline>)",
                 "mailbox": "信箱 (<tag-underline>[</tag-underline>)",
-                "debris": "碎片 (<tag-underline>f</tag-underline>)"
+                "debris": "碎片 (<tag-underline>f</tag-underline>)",
+                "not-aligned-with-crosswalk": "未對齊行穿線(<tag-underline>g</tag-underline>)",
+                "utility-cabinet": "變電箱/設備箱(<tag-underline>]</tag-underline>)",
+                "cycle-lane-protection-from-traffic": "自行車道：沒有交通保護(<tag-underline>e</tag-underline>)",
+                "cycle-lane-no-protection-from-traffic": "自行車道：沒有交通保護(<tag-underline>t</tag-underline>)",
+                "cycle-lane-surface-problem": "自行車道：$t(audit:center-ui.context-menu.tag.surface-problem)",
+                "cycle-lane-faded-paint": "自行車道：$t(audit:center-ui.context-menu.tag.paint-fading)",
+                "cycle-lane-debris-pooled-water": "自行車道：$t(audit:center-ui.context-menu.tag.debris-pooled-water)",
+                "cycle-lane-parked-car": "自行車道：$t(audit:center-ui.context-menu.tag.parked-car)",
+                "cycle-box": "自行車箱(<tag-underline>x</tag-underline>)"
             },
             "tooltip": {
                 "passable": "能通行的",
diff --git a/public/locales/zh-TW/common.json b/public/locales/zh-TW/common.json
index b0a4474afc..7435289f3e 100644
--- a/public/locales/zh-TW/common.json
+++ b/public/locales/zh-TW/common.json
@@ -123,7 +123,16 @@
         "utility panel": "人孔蓋",
         "outdoor dining area": "戶外用餐區",
         "mailbox": "信箱",
-        "debris": "碎片"
+        "debris": "碎片",
+        "not aligned with crosswalk": "未對齊行穿線",
+        "utility cabinet": "變電箱/設備箱",
+        "cycle lane- protection from traffic": "自行車道：防止交通堵塞",
+        "cycle lane- no protection from traffic": "自行車道：沒有交通保護",
+        "cycle lane- surface problem": "自行車道：$t(common:tag.surface problem)",
+        "cycle lane- faded paint": "自行車道：$t(common:tag.paint fading)",
+        "cycle lane- debris / pooled water": "自行車道：$t(common:tag.debris / pooled water)",
+        "cycle lane- parked car": "自行車道：$t(common:tag.parked car)",
+        "cycle box": "自行車箱"
     },
     "gsv-info": {
         "details-title": "詳細資訊",
diff --git a/public/stylesheets/userProfile.css b/public/stylesheets/userProfile.css
index b2dea122fe..8903085b8d 100644
--- a/public/stylesheets/userProfile.css
+++ b/public/stylesheets/userProfile.css
@@ -18,6 +18,7 @@ svg {
 
 #map-label-legend table td {
     border-top: 0;
+    padding: 2px;
 }
 
 #profile-container {
@@ -222,3 +223,7 @@ svg {
 .mistake-img {
     max-width: 100%;
 }
+
+.modal-header .custom-close {
+    margin-top: -30px; 
+}