diff --git a/css/app.css b/css/app.css
index 5064b435e..440bed8e3 100644
--- a/css/app.css
+++ b/css/app.css
@@ -1180,10 +1180,13 @@ a.success-action {
           border-radius: 4px;
 }
 
+.radial-menu-background {
+    stroke: #aaa;
+    stroke-opacity: 0.4;
+}
+
 .radial-menu-item {
-    fill: white;
-    stroke: black;
-    stroke-width: 1;
+    fill: black;
     cursor:url(../img/cursor-pointer.png) 6 1, auto;
 }
 
@@ -1201,6 +1204,17 @@ a.success-action {
     fill: rgba(255,255,255,.5);
 }
 
+.radial-menu image {
+    pointer-events: none;
+}
+
+.radial-menu-tooltip {
+    background: rgba(255, 255, 255, 0.8);
+    padding: 5px;
+    -webkit-border-radius: 4px;
+       -moz-border-radius: 4px;
+            border-radius: 4px;
+}
 
 /* Media Queries
 ------------------------------------------------------- */
diff --git a/index.html b/index.html
index deadb5add..4b12084e5 100644
--- a/index.html
+++ b/index.html
@@ -125,9 +125,13 @@
         <script src='js/id/graph/validate.js'></script>
 
         <script src='js/id/connection.js'></script>
+
+        <script src='locale/locale.js'></script>
+        <script src='locale/en.js'></script>
     </head>
     <body>
         <div id="iD"></div><script>
+            locale.current = 'en';
             d3.json('keys.json', function(err, keys) {
                 var id = iD();
                 id.connection().keys(keys)
diff --git a/js/id/modes/select.js b/js/id/modes/select.js
index 06c05b7ea..ad06bda35 100644
--- a/js/id/modes/select.js
+++ b/js/id/modes/select.js
@@ -10,20 +10,6 @@ iD.modes.Select = function(entity, initial) {
         behaviors,
         radialMenu;
 
-    function remove() {
-        if (entity.type === 'way') {
-            mode.history.perform(
-                iD.actions.DeleteWay(entity.id),
-                'deleted a way');
-        } else if (entity.type === 'node') {
-            mode.history.perform(
-                iD.actions.DeleteNode(entity.id),
-                'deleted a node');
-        }
-
-        mode.controller.exit();
-    }
-
     function changeTags(d, tags) {
         if (!_.isEqual(entity.tags, tags)) {
             mode.history.perform(
@@ -49,6 +35,18 @@ iD.modes.Select = function(entity, initial) {
             behavior(surface);
         });
 
+        var operations = d3.values(iD.operations)
+            .map(function (o) { return o(entity.id, mode); })
+            .filter(function (o) { return o.available(); });
+
+        operations.forEach(function(operation) {
+            keybinding.on(operation.key, function () {
+                if (operation.enabled()) {
+                    operation();
+                }
+            });
+        });
+
         var q = iD.util.stringQs(location.hash.substring(1));
         location.replace('#' + iD.util.qsString(_.assign(q, {
             id: entity.id
@@ -126,8 +124,6 @@ iD.modes.Select = function(entity, initial) {
         surface.on('click.select', click)
             .on('dblclick.select', dblclick);
 
-        keybinding.on('⌫', remove);
-
         d3.select(document)
             .call(keybinding);
 
@@ -137,7 +133,7 @@ iD.modes.Select = function(entity, initial) {
             })
             .classed('selected', true);
 
-        radialMenu = iD.ui.RadialMenu(entity, mode);
+        radialMenu = iD.ui.RadialMenu(operations);
 
         if (d3.event && !initial) {
             var loc = map.mouseCoordinates();
diff --git a/js/id/operations/circular.js b/js/id/operations/circular.js
index 0af64aa20..eb94150fc 100644
--- a/js/id/operations/circular.js
+++ b/js/id/operations/circular.js
@@ -1,7 +1,8 @@
 iD.operations.Circular = function(entityId, mode) {
-    var action = iD.actions.Circular(entityId, mode.map);
+    var history = mode.map.history(),
+        action = iD.actions.Circular(entityId, mode.map);
 
-    var operation = function(history) {
+    var operation = function() {
         var graph = history.graph(),
             entity = graph.entity(entityId),
             geometry = entity.geometry(graph);
@@ -18,17 +19,21 @@ iD.operations.Circular = function(entityId, mode) {
         }
     };
 
-    operation.available = function(graph) {
-        var entity = graph.entity(entityId);
+    operation.available = function() {
+        var graph = history.graph(),
+            entity = graph.entity(entityId);
         return entity.geometry(graph) === 'area' || entity.geometry(graph) === 'line';
     };
 
-    operation.enabled = function(graph) {
+    operation.enabled = function() {
+        var graph = history.graph();
         return action.enabled(graph);
     };
 
     operation.id = "circular";
+    operation.key = "O";
     operation.title = "Circular";
+    operation.description = "Make this round";
 
     return operation;
 };
diff --git a/js/id/operations/delete.js b/js/id/operations/delete.js
index 53038dbc4..03d788261 100644
--- a/js/id/operations/delete.js
+++ b/js/id/operations/delete.js
@@ -1,5 +1,7 @@
-iD.operations.Delete = function(entityId) {
-    var operation = function(history) {
+iD.operations.Delete = function(entityId, mode) {
+    var history = mode.map.history();
+
+    var operation = function() {
         var graph = history.graph(),
             entity = graph.entity(entityId),
             geometry = entity.geometry(graph);
@@ -26,8 +28,9 @@ iD.operations.Delete = function(entityId) {
         }
     };
 
-    operation.available = function(graph) {
-        var entity = graph.entity(entityId);
+    operation.available = function() {
+        var graph = history.graph(),
+            entity = graph.entity(entityId);
         return _.contains(['vertex', 'point', 'line', 'area'], entity.geometry(graph));
     };
 
@@ -36,7 +39,9 @@ iD.operations.Delete = function(entityId) {
     };
 
     operation.id = "delete";
+    operation.key = "⌫";
     operation.title = "Delete";
+    operation.description = "Remove this from the map";
 
     return operation;
 };
diff --git a/js/id/operations/move.js b/js/id/operations/move.js
index 9806ede67..383ca4206 100644
--- a/js/id/operations/move.js
+++ b/js/id/operations/move.js
@@ -1,9 +1,12 @@
 iD.operations.Move = function(entityId, mode) {
+    var history = mode.map.history();
+
     var operation = function() {
         mode.controller.enter(iD.modes.MoveWay(entityId));
     };
 
-    operation.available = function(graph) {
+    operation.available = function() {
+        var graph = history.graph();
         return graph.entity(entityId).type === 'way';
     };
 
@@ -12,7 +15,9 @@ iD.operations.Move = function(entityId, mode) {
     };
 
     operation.id = "move";
+    operation.key = "M";
     operation.title = "Move";
+    operation.description = "Move this to a different location";
 
     return operation;
 };
diff --git a/js/id/operations/reverse.js b/js/id/operations/reverse.js
index 941d8a4da..b36dfd60c 100644
--- a/js/id/operations/reverse.js
+++ b/js/id/operations/reverse.js
@@ -1,12 +1,15 @@
-iD.operations.Reverse = function(entityId) {
-    var operation = function(history) {
+iD.operations.Reverse = function(entityId, mode) {
+    var history = mode.map.history();
+
+    var operation = function() {
         history.perform(
             iD.actions.ReverseWay(entityId),
             'reversed a line');
     };
 
-    operation.available = function(graph) {
-        var entity = graph.entity(entityId);
+    operation.available = function() {
+        var graph = history.graph(),
+            entity = graph.entity(entityId);
         return entity.geometry(graph) === 'line';
     };
 
@@ -15,7 +18,9 @@ iD.operations.Reverse = function(entityId) {
     };
 
     operation.id = "reverse";
+    operation.key = "V";
     operation.title = "Reverse";
+    operation.description = "Make this way go in the opposite direction";
 
     return operation;
 };
diff --git a/js/id/operations/split.js b/js/id/operations/split.js
index 838dac88e..3dcab7481 100644
--- a/js/id/operations/split.js
+++ b/js/id/operations/split.js
@@ -1,21 +1,26 @@
-iD.operations.Split = function(entityId) {
-    var action = iD.actions.SplitWay(entityId);
+iD.operations.Split = function(entityId, mode) {
+    var history = mode.map.history(),
+        action = iD.actions.SplitWay(entityId);
 
-    var operation = function(history) {
+    var operation = function() {
         history.perform(action, 'split a way');
     };
 
-    operation.available = function(graph) {
-        var entity = graph.entity(entityId);
+    operation.available = function() {
+        var graph = history.graph(),
+            entity = graph.entity(entityId);
         return entity.geometry(graph) === 'vertex';
     };
 
-    operation.enabled = function(graph) {
+    operation.enabled = function() {
+        var graph = history.graph();
         return action.enabled(graph);
     };
 
     operation.id = "split";
+    operation.key = "X";
     operation.title = "Split";
+    operation.description = "Split this into two ways at this point";
 
     return operation;
 };
diff --git a/js/id/operations/unjoin.js b/js/id/operations/unjoin.js
index 985a41697..c18de3029 100644
--- a/js/id/operations/unjoin.js
+++ b/js/id/operations/unjoin.js
@@ -1,21 +1,26 @@
-iD.operations.Unjoin = function(entityId) {
-    var action = iD.actions.UnjoinNode(entityId);
+iD.operations.Unjoin = function(entityId, mode) {
+    var history = mode.map.history(),
+        action = iD.actions.UnjoinNode(entityId);
 
-    var operation = function(history) {
+    var operation = function() {
         history.perform(action, 'unjoined lines');
     };
 
-    operation.available = function(graph) {
-        var entity = graph.entity(entityId);
+    operation.available = function() {
+        var graph = history.graph(),
+            entity = graph.entity(entityId);
         return entity.geometry(graph) === 'vertex';
     };
 
-    operation.enabled = function(graph) {
+    operation.enabled = function() {
+        var graph = history.graph();
         return action.enabled(graph);
     };
 
     operation.id = "unjoin";
+    operation.key = "⇧-J";
     operation.title = "Unjoin";
+    operation.description = "Disconnect these ways from each other";
 
     return operation;
 };
diff --git a/js/id/ui/inspector.js b/js/id/ui/inspector.js
index 8c512953e..11d9f837f 100644
--- a/js/id/ui/inspector.js
+++ b/js/id/ui/inspector.js
@@ -22,7 +22,7 @@ iD.ui.inspector = function() {
             .attr('class', 'inspector-inner tag-wrap fillL2');
 
         inspectorwrap.append('h4')
-            .text('Edit tags');
+            .text(t('edit_tags'));
 
         tagList = inspectorwrap.append('ul');
 
@@ -148,7 +148,7 @@ iD.ui.inspector = function() {
                             iD.ui.flash()
                                 .select('.content')
                                 .append('h3')
-                                .text('This is no documentation available for this tag combination');
+                                .text(t('no_documentation_combination'));
                         }
                     });
                 } else if (d.key) {
@@ -166,7 +166,7 @@ iD.ui.inspector = function() {
                             iD.ui.flash()
                                 .select('.content')
                                 .append('h3')
-                                .text('This is no documentation available for this key');
+                                .text(t('no_documentation_key'));
                         }
                     });
                 }
diff --git a/js/id/ui/layerswitcher.js b/js/id/ui/layerswitcher.js
index 282bd75e2..ea87cb7a9 100644
--- a/js/id/ui/layerswitcher.js
+++ b/js/id/ui/layerswitcher.js
@@ -35,7 +35,7 @@ iD.ui.layerswitcher = function(map) {
             .append('button')
             .attr('tabindex', -1)
             .attr('class', 'fillD')
-            .attr('title', 'Layer Settings')
+            .attr('title', t('layer_settings'))
             .html("<span class='layers icon'></span>")
             .on('click.layerswitcher-toggle', toggle);
 
@@ -59,7 +59,7 @@ iD.ui.layerswitcher = function(map) {
             .append('div')
             .attr('class', 'opacity-options-wrapper');
 
-        opa.append('h4').text('Layers');
+        opa.append('h4').text(t('layers'));
 
         opa.append('ul')
             .attr('class', 'opacity-options')
@@ -68,7 +68,7 @@ iD.ui.layerswitcher = function(map) {
             .enter()
             .append('li')
                 .attr('data-original-title', function(d) {
-                    return (d * 100) + "% opacity";
+                    return t('percent_opacity', { opacity: (d * 100) });
                 })
                 .on('click.set-opacity', function(d) {
                     d3.select('#tile-g')
diff --git a/js/id/ui/notice.js b/js/id/ui/notice.js
index 479673ba1..bcf44b7c9 100644
--- a/js/id/ui/notice.js
+++ b/js/id/ui/notice.js
@@ -18,7 +18,7 @@ iD.ui.notice = function(selection) {
 
     div.append('span')
         .attr('class', 'notice-text')
-        .text('zoom in to edit the map');
+        .text(t('zoom_in_edit'));
 
     notice.message = function(_) {
         if (_) {
diff --git a/js/id/ui/radial_menu.js b/js/id/ui/radial_menu.js
index d38ef3679..f06fa362e 100644
--- a/js/id/ui/radial_menu.js
+++ b/js/id/ui/radial_menu.js
@@ -1,50 +1,90 @@
-iD.ui.RadialMenu = function(entity, mode) {
-    var arcs;
+iD.ui.RadialMenu = function(operations) {
+    var menu;
 
     var radialMenu = function(selection, center) {
-        var history = mode.map.history(),
-            graph = history.graph(),
-            operations = d3.values(iD.operations)
-                .map(function (o) { return o(entity.id, mode); })
-                .filter(function (o) { return o.available(graph); });
+        if (!operations.length)
+            return;
 
         function click(operation) {
             d3.event.stopPropagation();
-            operation(history);
+            operation();
         }
 
-        var arc = d3.svg.arc()
-            .outerRadius(70)
-            .innerRadius(30)
-            .startAngle(function (d, i) { return 2 * Math.PI / operations.length * i; })
-            .endAngle(function (d, i) { return 2 * Math.PI / operations.length * (i + 1); });
-
-        arcs = selection.selectAll()
-            .data(operations)
-            .enter().append('g')
+        menu = selection.append('g')
             .attr('class', 'radial-menu')
             .attr('transform', "translate(" + center + ")")
             .attr('opacity', 0);
 
-        arcs.transition()
+        menu.transition()
             .attr('opacity', 0.8);
 
-        arcs.append('path')
-            .attr('class', function (d) { return 'radial-menu-item radial-menu-item-' + d.id; })
-            .attr('d', arc)
-            .classed('disabled', function (d) { return !d.enabled(graph); })
-            .on('click', click);
+        var r = 50,
+            a = Math.PI / 4,
+            a0 = -Math.PI / 4,
+            a1 = a0 + (operations.length - 1) * a;
 
-        arcs.append('text')
-            .attr("transform", function(d, i) { return "translate(" + arc.centroid(d, i) + ")"; })
-            .attr("dy", ".35em")
-            .style("text-anchor", "middle")
-            .text(function(d) { return d.title; });
+        menu.append('path')
+            .attr('class', 'radial-menu-background')
+            .attr('d', 'M' + r * Math.sin(a0) + ',' +
+                             r * Math.cos(a0) +
+                      ' A' + r + ',' + r + ' 0 0,0 ' +
+                             r * Math.sin(a1) + ',' +
+                             r * Math.cos(a1))
+            .attr('stroke-width', 50)
+            .attr('stroke-linecap', 'round');
+
+        var button = menu.selectAll()
+            .data(operations)
+            .enter().append('g')
+            .attr('transform', function(d, i) {
+                return 'translate(' + r * Math.sin(a0 + i * a) + ',' +
+                                      r * Math.cos(a0 + i * a) + ')';
+            });
+
+        button.append('circle')
+            .attr('class', function (d) { return 'radial-menu-item radial-menu-item-' + d.id; })
+            .attr('r', 15)
+            .attr('title', function (d) { return d.title; })
+            .classed('disabled', function (d) { return !d.enabled(); })
+            .on('click', click)
+            .on('mouseover', mouseover)
+            .on('mouseout', mouseout);
+
+        button.append('image')
+            .attr('width', 16)
+            .attr('height', 16)
+            .attr('transform', 'translate(-8, -8)')
+            .attr('xlink:href', 'icons/helipad.png');
+
+        var tooltip = menu.append('foreignObject')
+            .style('display', 'none')
+            .attr('width', 200)
+            .attr('height', 400);
+
+        tooltip.append('xhtml:div')
+            .attr('class', 'radial-menu-tooltip');
+
+        function mouseover(d, i) {
+            var angle = a0 + i * a,
+                dx = angle < 0 ? -200 : 0,
+                dy = 0;
+
+            tooltip
+                .attr('x', (r + 30) * Math.sin(angle) + dx)
+                .attr('y', (r + 30) * Math.cos(angle) + dy)
+                .style('display', 'block')
+                .select('div')
+                .text(d.description);
+        }
+
+        function mouseout() {
+            tooltip.style('display', 'none');
+        }
     };
 
     radialMenu.close = function(selection) {
-        if (arcs) {
-            arcs.transition()
+        if (menu) {
+            menu.transition()
                 .attr('opacity', 0)
                 .remove();
         }
diff --git a/js/id/ui/save.js b/js/id/ui/save.js
index 50f9891f7..8784b2ca4 100644
--- a/js/id/ui/save.js
+++ b/js/id/ui/save.js
@@ -9,8 +9,8 @@ iD.ui.save = function() {
             tooltip = bootstrap.tooltip()
                 .placement('bottom');
 
-        selection.html("<span class='label'>Save</span><small id='as-username'></small>")
-            .attr('title', 'Save changes to OpenStreetMap, making them visible to other users')
+        selection.html("<span class='label'>" + t('save') + "</span><small id='as-username'></small>")
+            .attr('title', t('save_help'))
             .attr('tabindex', -1)
             .property('disabled', true)
             .call(tooltip)
@@ -18,7 +18,7 @@ iD.ui.save = function() {
 
             function commit(e) {
                 d3.select('.shaded').remove();
-                var l = iD.ui.loading('Uploading changes to OpenStreetMap.', true);
+                var l = iD.ui.loading(t('uploading_changes'), true);
                 connection.putChangeset(history.changes(), e.comment, history.imagery_used(), function(err, changeset_id) {
                     l.remove();
                     history.reset();
@@ -27,7 +27,7 @@ iD.ui.save = function() {
                         var desc = iD.ui.confirm()
                             .select('.description');
                         desc.append('h2')
-                            .text('An error occurred while trying to save');
+                            .text(t('save_error'));
                         desc.append('p').text(err.responseText);
                     } else {
                         var modal = iD.ui.modal();
@@ -67,7 +67,7 @@ iD.ui.save = function() {
                 });
             } else {
                 iD.ui.confirm().select('.description')
-                    .append('h3').text('You don\'t have any changes to save.');
+                    .append('h3').text(t('no_changes'));
             }
 
         });
diff --git a/js/id/ui/success.js b/js/id/ui/success.js
index 8cc6e328b..fffa7b6ab 100644
--- a/js/id/ui/success.js
+++ b/js/id/ui/success.js
@@ -8,7 +8,7 @@ iD.ui.success = function(connection) {
 
         var section = body.append('div').attr('class','modal-section fillD');
 
-        header.append('h2').text('You Just Edited OpenStreetMap!');
+        header.append('h2').text(t('just_edited'));
 
         var m = '';
         if (changeset.comment) {
@@ -24,7 +24,7 @@ iD.ui.success = function(connection) {
             })
             .attr('target', '_blank')
             .attr('class', 'success-action')
-            .text('View on OSM');
+            .text(t('view_on_osm'));
 
         header.append('a')
             .attr('target', '_blank')
diff --git a/js/id/ui/tag_reference.js b/js/id/ui/tag_reference.js
index eb1ee84bd..cdb22b505 100644
--- a/js/id/ui/tag_reference.js
+++ b/js/id/ui/tag_reference.js
@@ -24,7 +24,7 @@ iD.ui.tagReference = function(selection) {
 
         referenceBody
             .append('h5')
-            .text('Description');
+            .text(t('description'));
 
         if (selection.datum().image) {
             referenceBody
diff --git a/js/id/ui/userpanel.js b/js/id/ui/userpanel.js
index d0d8fa63d..2b28411a6 100644
--- a/js/id/ui/userpanel.js
+++ b/js/id/ui/userpanel.js
@@ -34,7 +34,7 @@ iD.ui.userpanel = function(connection) {
                         .append('a')
                         .attr('class', 'logout')
                         .attr('href', '#')
-                        .text('logout')
+                        .text(t('logout'))
                         .on('click.logout', function() {
                             d3.event.preventDefault();
                             event.logout();
diff --git a/locale/en.js b/locale/en.js
new file mode 100644
index 000000000..2a011a734
--- /dev/null
+++ b/locale/en.js
@@ -0,0 +1,40 @@
+locale.en = {
+    "browse": "Browse",
+    "point": "Point",
+    "line": "Line",
+    "area": "Area",
+
+    "save": "Save",
+    "save_help": "Save changes to OpenStreetMap, making them visible to other users",
+    "no_changes": "You don't have any changes to save.",
+    "save_error": "An error occurred while trying to save",
+    "uploading_changes": "Uploading changes to OpenStreetMap.",
+    "just_edited": "You Just Edited OpenStreetMap!",
+    "okay": "Okay",
+
+    "zoom-in": "Zoom In",
+    "zoom-out": "Zoom Out",
+
+    "browser_notice": "This editor is supported in Firefox, Chrome, Safari, Opera, and Internet Explorer 9 and above. Please upgrade your browser or use Potlatch 2 to edit the map.",
+
+    "layer_settings": "Layer Settings",
+
+    "no_documentation_combination":  "This is no documentation available for this tag combination",
+    "no_documentation_key": "This is no documentation available for this key",
+
+    "view_on_osm": "View on OSM",
+
+    "zoom_in_edit": "zoom in to edit the map",
+
+    "edit_tags": "Edit tags",
+
+    "find_location": "Find A Location",
+    "find_placeholder": "find a place",
+
+    "description": "Description",
+
+    "logout": "logout",
+
+    "layers": "Layers",
+    "percent_opacity": "{opacity}% opacity"
+}
diff --git a/locale/locale.js b/locale/locale.js
new file mode 100644
index 000000000..9e4786059
--- /dev/null
+++ b/locale/locale.js
@@ -0,0 +1,11 @@
+var locale = { current: 'en' };
+
+function t(s, o) {
+    if (locale[locale.current][s] !== undefined) {
+        var rep = locale[locale.current][s];
+        if (o) for (var k in o) rep = rep.replace('{' + k + '}', o[k]);
+        return rep;
+    } else {
+        if (console) console.error('key ' + s + ' not found');
+    }
+}
diff --git a/test/index.html b/test/index.html
index 12cf31886..b682f2cdd 100644
--- a/test/index.html
+++ b/test/index.html
@@ -72,6 +72,7 @@
     <script src='../js/id/actions/add_way.js'></script>
     <script src='../js/id/actions/add_way_node.js'></script>
     <script src='../js/id/actions/change_entity_tags.js'></script>
+    <script src='../js/id/actions/circular.js'></script>
     <script src="../js/id/actions/delete_node.js"></script>
     <script src="../js/id/actions/delete_way.js"></script>
     <script src='../js/id/actions/move_node.js'></script>
@@ -119,6 +120,9 @@
 
     <script src='../js/id/connection.js'></script>
 
+    <script src='../locale/locale.js'></script>
+    <script src='../locale/en.js'></script>
+
     <script>
         iD.debug = true;
         mocha.setup({
