diff --git a/readme.txt b/readme.txt
index 944351e..339db77 100755
--- a/readme.txt
+++ b/readme.txt
@@ -3,8 +3,8 @@
 Contributors: cmanon, jrfoell, lancewillett, dlintott, sebastianerb
 Tags: strava, activity, bicycle, cycling, biking, running, run, swimming, swim, paddle, kayak, gps, shortcode, widget, plugin
 Requires at least: 4.6
-Tested up to: 5.5
-Stable tag: 2.5.0
+Tested up to: 5.6
+Stable tag: 2.5.1
 Requires PHP: 5.3
 License: GPLv2 or later
 
@@ -113,9 +113,13 @@ On the WP-Strava settings page you cannot currently remove and add another athle
 == Changelog ==
 
 
-= Unreleased =
+= 2.5.1 =
 
 Fix latest_map class replacing echo with return https://wordpress.org/support/topic/latest-activity-map-shortcode-wrong-placed-on-page/
+Fix styling on pace activity max speed.
+Fix broken water pace on activity.
+Fix pace types and remove 'other' - making 'speed' default.
+Fix to remove map link in editor so you don't leave the editor.
 
 = 2.5.0 =
 
diff --git a/src/WPStrava/Activity.php b/src/WPStrava/Activity.php
index 9623874..242792f 100755
--- a/src/WPStrava/Activity.php
+++ b/src/WPStrava/Activity.php
@@ -109,11 +109,22 @@ class WPStrava_Activity {
 	 * @since  2.3.2
 	 */
 	public function get_activity_link( $activity_id, $text, $title = '' ) {
-		if ( WPStrava::get_instance()->settings->no_link ) {
+		if ( $this->is_rest_request() || WPStrava::get_instance()->settings->no_link ) {
 			return $text;
 		}
 		$url        = esc_url( self::ACTIVITIES_URL . $activity_id );
 		$title_attr = $title ? " title='" . esc_attr( $title ) . "'" : '';
 		return "<a href='{$url}'{$title_attr}>{$text}</a>";
 	}
+
+	/**
+	 * Check if rest request to skip link rendering in block editor.
+	 *
+	 * @return boolean
+	 * @author Justin Foell <justin@foell.org>
+	 * @since  2.5.1
+	 */
+	private function is_rest_request() {
+		return defined( 'REST_REQUEST' ) && REST_REQUEST;
+	}
 }
diff --git a/src/WPStrava/ActivityRenderer.php b/src/WPStrava/ActivityRenderer.php
index 100b932..59e2656 100644
--- a/src/WPStrava/ActivityRenderer.php
+++ b/src/WPStrava/ActivityRenderer.php
@@ -98,20 +98,11 @@ class WPStrava_ActivityRenderer {
 								<div class="activity-details-table-units">' . $strava_som->get_pace_label() . '</div>
 							</td>';
 				$max_speed = '<td data-label="' . __( 'Max Speed', 'wp-strava' ) . '">
-								<div>' . $strava_som->pace( $activity_details->max_speed ) . '</div>
+								<div class="activity-details-table-info">' . $strava_som->pace( $activity_details->max_speed ) . '</div>
+								<div class="activity-details-table-units">' . $strava_som->get_pace_label() . '</div>
 							</td>';
 				break;
-			case WPStrava_ActivityType::TYPE_GROUP_SPEED:
-				$avg_speed = '<td data-label="' . __( 'Average Speed', 'wp-strava' ) . '">
-								<div class="activity-details-table-info">' . $strava_som->speed( $activity_details->average_speed ) . '</div>
-								<div class="activity-details-table-units">' . $strava_som->get_speed_label() . '</div>
-							</td>';
-				$max_speed = '<td data-label="' . __( 'Max Speed', 'wp-strava' ) . '">
-								<div class="activity-details-table-info">' . $strava_som->speed( $activity_details->max_speed ) . '</div>
-								<div class="activity-details-table-units">' . $strava_som->get_speed_label() . '</div>
-							</td>';
-				break;
-			case WPStrava_ActivityType::TYPE_GROUP_PACE:
+			case WPStrava_ActivityType::TYPE_GROUP_WATER:
 				$avg_speed = '<td data-label="' . __( 'Average Speed', 'wp-strava' ) . '">
 								<div class="activity-details-table-info">' . $strava_som->swimpace( $activity_details->average_speed ) . '</div>
 								<div class="activity-details-table-units">' . $strava_som->get_swimpace_label() . '</div>
@@ -121,9 +112,16 @@ class WPStrava_ActivityRenderer {
 								<div class="activity-details-table-units">' . $strava_som->get_swimpace_label() . '</div>
 							</td>';
 				break;
+			case WPStrava_ActivityType::TYPE_GROUP_SPEED:
 			default:
-				$avg_title = '';
-				$max_title = '';
+				$avg_speed = '<td data-label="' . __( 'Average Speed', 'wp-strava' ) . '">
+								<div class="activity-details-table-info">' . $strava_som->speed( $activity_details->average_speed ) . '</div>
+								<div class="activity-details-table-units">' . $strava_som->get_speed_label() . '</div>
+							</td>';
+				$max_speed = '<td data-label="' . __( 'Max Speed', 'wp-strava' ) . '">
+								<div class="activity-details-table-info">' . $strava_som->speed( $activity_details->max_speed ) . '</div>
+								<div class="activity-details-table-units">' . $strava_som->get_speed_label() . '</div>
+							</td>';
 				break;
 		}
 
diff --git a/src/WPStrava/ActivityType.php b/src/WPStrava/ActivityType.php
index 7ef74e3..825020b 100644
--- a/src/WPStrava/ActivityType.php
+++ b/src/WPStrava/ActivityType.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ActivityType  [activitytype].
+ * ActivityType [activitytype].
  * @package WPStrava
  */
 
@@ -45,22 +45,18 @@ class WPStrava_ActivityType {
 	const TYPE_WORKOUT         = 'Workout';
 	const TYPE_YOGA            = 'Yoga';
 
-	const TYPE_DEFAULT = self::TYPE_RIDE;
-
-	private static $water_types = array( self::TYPE_SWIM );
 	private static $pace_types  = array( self::TYPE_CANOEING, self::TYPE_HIKE, self::TYPE_RUN, self::TYPE_SNOWSHOE, self::TYPE_VIRTUALRUN, self::TYPE_WALK );
-	private static $speed_types = array( self::TYPE_ALPINESKI, self::TYPE_BACKCOUNTRYSKI, self::TYPE_EBIKERIDE, self::TYPE_ELLIPTICAL, self::TYPE_HANDCYCLE, self::TYPE_ICESKATE, self::TYPE_INLINESKATE, self::TYPE_KAYAKING, self::TYPE_KITESURF, self::TYPE_NORDICSKI, self::TYPE_RIDE, self::TYPE_ROCKCLIMBING, self::TYPE_ROLLERSKI, self::TYPE_ROWING, self::TYPE_SNOWBOARD, self::TYPE_STAIRSTEPPER, self::TYPE_STANDUPPADDLING, self::TYPE_SURFING, self::TYPE_VIRTUALRIDE, self::TYPE_WHEELCHAIR, self::TYPE_WINDSURF );
+	private static $water_types = array( self::TYPE_SWIM );
 
-	const TYPE_GROUP_WATER = 'water';
 	const TYPE_GROUP_PACE  = 'pace';
+	const TYPE_GROUP_WATER = 'water';
 	const TYPE_GROUP_SPEED = 'speed';
-	const TYPE_GROUP_OTHER = 'other';
 
 	/**
-	 * Get the type of activity.
+	 * Get the type of activity - defaults to 'speed'.
 	 *
 	 * @param string $type Type provided by Strava.
-	 * @return string Type group (water/pace/speed/other).
+	 * @return string Type group (pace/water/speed).
 	 * @author Sebastian Erb <mail@sebastianerb.com>
 	 * @since  1.7.0
 	 */
@@ -70,15 +66,11 @@ class WPStrava_ActivityType {
 			return self::TYPE_GROUP_PACE;
 		}
 
-		if ( in_array( $type, self::$speed_types, true ) ) {
-			return self::TYPE_GROUP_SPEED;
-		}
-
 		if ( in_array( $type, self::$water_types, true ) ) {
 			return self::TYPE_GROUP_WATER;
 		}
 
-		return self::TYPE_GROUP_OTHER;
+		return self::TYPE_GROUP_SPEED;
 	}
 
 }
diff --git a/wp-strava.php b/wp-strava.php
index e69507e..dd94dff 100755
--- a/wp-strava.php
+++ b/wp-strava.php
@@ -3,7 +3,7 @@
  * Plugin Name: WP Strava
  * Plugin URI: https://wordpress.org/plugins/wp-strava/
  * Description: Show your strava.com activity on your WordPress site. Some Icons are Copyright © Yusuke Kamiyamane. All rights reserved. Licensed under a Creative Commons Attribution 3.0 license.
- * Version: 2.5.0
+ * Version: 2.5.1
  * Author: Carlos Santa Cruz, Justin Foell, Lance Willett, Daniel Lintott, Sebastian Erb
  * License: GPL2
  * Text Domain: wp-strava
@@ -27,7 +27,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-define( 'WPSTRAVA_PLUGIN_VERSION', '2.5.0' );
+define( 'WPSTRAVA_PLUGIN_VERSION', '2.5.1' );
 define( 'WPSTRAVA_PLUGIN_FILE', __FILE__ );
 define( 'WPSTRAVA_PLUGIN_DIR', trailingslashit( dirname( __FILE__ ) ) );
 define( 'WPSTRAVA_PLUGIN_URL', plugins_url( '/', __FILE__ ) );