diff --git a/src/blocks/activity/edit.js b/src/blocks/activity/edit.js
index 8cb73ec..f8dee63 100644
--- a/src/blocks/activity/edit.js
+++ b/src/blocks/activity/edit.js
@@ -1,14 +1,15 @@
 /* global wp, wpStrava */
 import EmbedPlaceholder from './embed-placeholder';
 import EmbedControls from './embed-controls';
-import SOMOverride from './som-override';
+// import SOMOverride from './som-override';
+
+import ServerSideRender from '@wordpress/server-side-render';
 
 const { __ } = wp.i18n;
 const { Component } = wp.element;
 const { InspectorControls } = wp.editor;
-const { PanelBody, ToggleControl } = wp.components;
+const { PanelBody, ToggleControl, Button, ButtonGroup } = wp.components;
 const { isEmpty } = lodash;
-const { serverSideRender: ServerSideRender } = wp;
 
 class Edit extends Component {
 
@@ -108,15 +109,41 @@ class Edit extends Component {
 							checked={ displayMarkers }
 							onChange={ (checked ) => this.toggleDisplayMarkers( checked ) }
 						/>
-						<SOMOverride
-							onChange={ ( value ) => this.overrideSOM( value ) }
-							som={ som }
-						/>
+						<div className="wp-block-wp-strava-som-control">
+							<p className="wp-block-wp-strava-som-control-row">
+									{ __( 'System of Measure (override from settings)' ) }
+							</p>
+							<div className="wp-block-wp-strava-som-control-row">
+								<ButtonGroup aria-label={ __( 'System of Measure', 'wp-strava' ) }>
+									<Button
+										key={ 'english' }
+										isSmall
+										isPrimary={ som == 'english' }
+										aria-pressed={ som == 'english' }
+										onClick={ () => this.overrideSOM( 'english' ) }
+									>
+										{ __( 'English', 'wp-strava' ) }
+									</Button>
+									<Button
+										key={ 'metric' }
+										isSmall
+										isPrimary={ som == 'metric' }
+										aria-pressed={ som == 'metric' }
+										onClick={ () => this.overrideSOM( 'metric' ) }
+									>
+										{ __( 'Metric', 'wp-strava' ) }
+									</Button>
+								</ButtonGroup>
+								<Button isSmall onClick={ () => this.overrideSOM() }>
+									{ __( 'Reset', 'wp-strava' ) }
+								</Button>
+							</div>
+						</div>
 					</PanelBody>
 				</InspectorControls>
 			</>
 		);
 	}
-};
+}
 
 export default Edit;