diff --git a/chrome/iso.css b/chrome/iso.css
index e866cf4..8be595c 100644
--- a/chrome/iso.css
+++ b/chrome/iso.css
@@ -1,6 +1,6 @@
 .ic-toggle {
   position: relative;
-  top: 10px;
+  top: 0px;
   right: 10px;
   float: right;
   margin-left: 20px;
@@ -98,9 +98,6 @@
 
 .ic-contributions-wrapper {
   position: relative;
-  border-top: solid 1px #d8d8d8;
-  border-right: solid 1px #d8d8d8;
-  border-left: solid 1px #d8d8d8;
 }
 
 /*
diff --git a/chrome/iso.js b/chrome/iso.js
index 0132222..90d0076 100644
--- a/chrome/iso.js
+++ b/chrome/iso.js
@@ -74,16 +74,12 @@ Iso = (function() {
   };
 
   Iso.prototype.initUI = function() {
-    var htmlFooter, htmlToggle, insertLocation, toggleClass;
-    ($('<div class="ic-contributions-wrapper"></div>')).insertBefore('#contributions-calendar');
-    ($('<canvas id="isometric-contributions" width="728" height="470"></canvas>')).appendTo('.ic-contributions-wrapper');
-    contributionsBox = ($('#contributions-calendar')).closest('.boxed-group');
-    insertLocation = (($('#contributions-calendar')).closest('.boxed-group')).find('h3');
-    toggleClass = '';
-    if (((contributionsBox.closest('.box')).find('.box-header .octicon-lock')).length) {
-      toggleClass = 'ic-with-lock';
-    }
-    htmlToggle = "<span class=\"ic-toggle " + toggleClass + "\">\n  <a href=\"#\" class=\"ic-toggle-option tooltipped tooltipped-nw squares\" data-ic-option=\"squares\" aria-label=\"Normal chart view\"></a>\n  <a href=\"#\" class=\"ic-toggle-option tooltipped tooltipped-nw cubes\" data-ic-option=\"cubes\" aria-label=\"Isometric chart view\"></a>\n</span>";
+    var htmlFooter, htmlToggle, insertLocation;
+    ($('<div class="ic-contributions-wrapper"></div>')).insertBefore($('.js-calendar-graph'));
+    ($('<canvas id="isometric-contributions" width="720" height="470"></canvas>')).appendTo('.ic-contributions-wrapper');
+    contributionsBox = $('.js-contribution-graph');
+    insertLocation = ($('.js-contribution-graph')).find('h2');
+    htmlToggle = "<span class=\"ic-toggle\">\n  <a href=\"#\" class=\"ic-toggle-option tooltipped tooltipped-nw squares\" data-ic-option=\"squares\" aria-label=\"Normal chart view\"></a>\n  <a href=\"#\" class=\"ic-toggle-option tooltipped tooltipped-nw cubes\" data-ic-option=\"cubes\" aria-label=\"Isometric chart view\"></a>\n</span>";
     ($(htmlToggle)).insertBefore(insertLocation);
     htmlFooter = "<span class=\"ic-footer\">\n  <a href=\"#\" class=\"ic-2d-toggle\">Show normal chart below ▾</a>\n</span>";
     ($(htmlFooter)).appendTo($('.ic-contributions-wrapper'));
@@ -220,11 +216,11 @@ Iso = (function() {
 
   Iso.prototype.renderIsometricChart = function() {
     var GH_OFFSET, MAX_HEIGHT, SIZE, canvas, contribCount, pixelView, point, self;
-    SIZE = 12;
+    SIZE = 10;
     GH_OFFSET = 13;
     MAX_HEIGHT = 100;
     canvas = document.getElementById('isometric-contributions');
-    point = new obelisk.Point(87, 100);
+    point = new obelisk.Point(110, 110);
     pixelView = new obelisk.PixelView(canvas, point);
     contribCount = null;
     self = this;
diff --git a/firefox/isometric-contributions.xpi b/firefox/isometric-contributions.xpi
index eb09ea7..4dcbf94 100644
Binary files a/firefox/isometric-contributions.xpi and b/firefox/isometric-contributions.xpi differ
diff --git a/firefox/isometric-contributions/iso.css b/firefox/isometric-contributions/iso.css
index a9c691d..a775aa1 100644
--- a/firefox/isometric-contributions/iso.css
+++ b/firefox/isometric-contributions/iso.css
@@ -1,6 +1,6 @@
 .ic-toggle {
   position: relative;
-  top: 10px;
+  top: 0px;
   right: 10px;
   float: right;
   margin-left: 20px;
@@ -98,9 +98,6 @@
 
 .ic-contributions-wrapper {
   position: relative;
-  border-top: solid 1px #d8d8d8;
-  border-right: solid 1px #d8d8d8;
-  border-left: solid 1px #d8d8d8;
 }
 
 /*
diff --git a/firefox/isometric-contributions/iso.js b/firefox/isometric-contributions/iso.js
index 0132222..90d0076 100644
--- a/firefox/isometric-contributions/iso.js
+++ b/firefox/isometric-contributions/iso.js
@@ -74,16 +74,12 @@ Iso = (function() {
   };
 
   Iso.prototype.initUI = function() {
-    var htmlFooter, htmlToggle, insertLocation, toggleClass;
-    ($('<div class="ic-contributions-wrapper"></div>')).insertBefore('#contributions-calendar');
-    ($('<canvas id="isometric-contributions" width="728" height="470"></canvas>')).appendTo('.ic-contributions-wrapper');
-    contributionsBox = ($('#contributions-calendar')).closest('.boxed-group');
-    insertLocation = (($('#contributions-calendar')).closest('.boxed-group')).find('h3');
-    toggleClass = '';
-    if (((contributionsBox.closest('.box')).find('.box-header .octicon-lock')).length) {
-      toggleClass = 'ic-with-lock';
-    }
-    htmlToggle = "<span class=\"ic-toggle " + toggleClass + "\">\n  <a href=\"#\" class=\"ic-toggle-option tooltipped tooltipped-nw squares\" data-ic-option=\"squares\" aria-label=\"Normal chart view\"></a>\n  <a href=\"#\" class=\"ic-toggle-option tooltipped tooltipped-nw cubes\" data-ic-option=\"cubes\" aria-label=\"Isometric chart view\"></a>\n</span>";
+    var htmlFooter, htmlToggle, insertLocation;
+    ($('<div class="ic-contributions-wrapper"></div>')).insertBefore($('.js-calendar-graph'));
+    ($('<canvas id="isometric-contributions" width="720" height="470"></canvas>')).appendTo('.ic-contributions-wrapper');
+    contributionsBox = $('.js-contribution-graph');
+    insertLocation = ($('.js-contribution-graph')).find('h2');
+    htmlToggle = "<span class=\"ic-toggle\">\n  <a href=\"#\" class=\"ic-toggle-option tooltipped tooltipped-nw squares\" data-ic-option=\"squares\" aria-label=\"Normal chart view\"></a>\n  <a href=\"#\" class=\"ic-toggle-option tooltipped tooltipped-nw cubes\" data-ic-option=\"cubes\" aria-label=\"Isometric chart view\"></a>\n</span>";
     ($(htmlToggle)).insertBefore(insertLocation);
     htmlFooter = "<span class=\"ic-footer\">\n  <a href=\"#\" class=\"ic-2d-toggle\">Show normal chart below ▾</a>\n</span>";
     ($(htmlFooter)).appendTo($('.ic-contributions-wrapper'));
@@ -220,11 +216,11 @@ Iso = (function() {
 
   Iso.prototype.renderIsometricChart = function() {
     var GH_OFFSET, MAX_HEIGHT, SIZE, canvas, contribCount, pixelView, point, self;
-    SIZE = 12;
+    SIZE = 10;
     GH_OFFSET = 13;
     MAX_HEIGHT = 100;
     canvas = document.getElementById('isometric-contributions');
-    point = new obelisk.Point(87, 100);
+    point = new obelisk.Point(110, 110);
     pixelView = new obelisk.PixelView(canvas, point);
     contribCount = null;
     self = this;
diff --git a/safari/isometric-contributions.safariextension/iso.css b/safari/isometric-contributions.safariextension/iso.css
index 8a9fdcc..a386ff8 100644
--- a/safari/isometric-contributions.safariextension/iso.css
+++ b/safari/isometric-contributions.safariextension/iso.css
@@ -1,6 +1,6 @@
 .ic-toggle {
   position: relative;
-  top: 10px;
+  top: 0px;
   right: 10px;
   float: right;
   margin-left: 20px;
@@ -98,9 +98,6 @@
 
 .ic-contributions-wrapper {
   position: relative;
-  border-top: solid 1px #d8d8d8;
-  border-right: solid 1px #d8d8d8;
-  border-left: solid 1px #d8d8d8;
 }
 
 /*
diff --git a/safari/isometric-contributions.safariextension/iso.js b/safari/isometric-contributions.safariextension/iso.js
index 0132222..90d0076 100644
--- a/safari/isometric-contributions.safariextension/iso.js
+++ b/safari/isometric-contributions.safariextension/iso.js
@@ -74,16 +74,12 @@ Iso = (function() {
   };
 
   Iso.prototype.initUI = function() {
-    var htmlFooter, htmlToggle, insertLocation, toggleClass;
-    ($('<div class="ic-contributions-wrapper"></div>')).insertBefore('#contributions-calendar');
-    ($('<canvas id="isometric-contributions" width="728" height="470"></canvas>')).appendTo('.ic-contributions-wrapper');
-    contributionsBox = ($('#contributions-calendar')).closest('.boxed-group');
-    insertLocation = (($('#contributions-calendar')).closest('.boxed-group')).find('h3');
-    toggleClass = '';
-    if (((contributionsBox.closest('.box')).find('.box-header .octicon-lock')).length) {
-      toggleClass = 'ic-with-lock';
-    }
-    htmlToggle = "<span class=\"ic-toggle " + toggleClass + "\">\n  <a href=\"#\" class=\"ic-toggle-option tooltipped tooltipped-nw squares\" data-ic-option=\"squares\" aria-label=\"Normal chart view\"></a>\n  <a href=\"#\" class=\"ic-toggle-option tooltipped tooltipped-nw cubes\" data-ic-option=\"cubes\" aria-label=\"Isometric chart view\"></a>\n</span>";
+    var htmlFooter, htmlToggle, insertLocation;
+    ($('<div class="ic-contributions-wrapper"></div>')).insertBefore($('.js-calendar-graph'));
+    ($('<canvas id="isometric-contributions" width="720" height="470"></canvas>')).appendTo('.ic-contributions-wrapper');
+    contributionsBox = $('.js-contribution-graph');
+    insertLocation = ($('.js-contribution-graph')).find('h2');
+    htmlToggle = "<span class=\"ic-toggle\">\n  <a href=\"#\" class=\"ic-toggle-option tooltipped tooltipped-nw squares\" data-ic-option=\"squares\" aria-label=\"Normal chart view\"></a>\n  <a href=\"#\" class=\"ic-toggle-option tooltipped tooltipped-nw cubes\" data-ic-option=\"cubes\" aria-label=\"Isometric chart view\"></a>\n</span>";
     ($(htmlToggle)).insertBefore(insertLocation);
     htmlFooter = "<span class=\"ic-footer\">\n  <a href=\"#\" class=\"ic-2d-toggle\">Show normal chart below ▾</a>\n</span>";
     ($(htmlFooter)).appendTo($('.ic-contributions-wrapper'));
@@ -220,11 +216,11 @@ Iso = (function() {
 
   Iso.prototype.renderIsometricChart = function() {
     var GH_OFFSET, MAX_HEIGHT, SIZE, canvas, contribCount, pixelView, point, self;
-    SIZE = 12;
+    SIZE = 10;
     GH_OFFSET = 13;
     MAX_HEIGHT = 100;
     canvas = document.getElementById('isometric-contributions');
-    point = new obelisk.Point(87, 100);
+    point = new obelisk.Point(110, 110);
     pixelView = new obelisk.PixelView(canvas, point);
     contribCount = null;
     self = this;
diff --git a/src/iso.coffee b/src/iso.coffee
index 5d506c5..a908986 100644
--- a/src/iso.coffee
+++ b/src/iso.coffee
@@ -46,21 +46,16 @@ class Iso
 
   initUI: ->
     ($ '<div class="ic-contributions-wrapper"></div>')
-      .insertBefore '#contributions-calendar'
-    ($ '<canvas id="isometric-contributions" width="728" height="470"></canvas>')
+      .insertBefore ($ '.js-calendar-graph')
+    ($ '<canvas id="isometric-contributions" width="720" height="470"></canvas>')
       .appendTo '.ic-contributions-wrapper'
 
-    contributionsBox = (($ '#contributions-calendar').closest '.boxed-group')
-    insertLocation   = (($ '#contributions-calendar').closest '.boxed-group').find 'h3'
-
-    toggleClass = ''
-    # Check for lock octicon
-    if ((contributionsBox.closest '.box').find '.box-header .octicon-lock').length
-      toggleClass = 'ic-with-lock'
+    contributionsBox = ($ '.js-contribution-graph')
+    insertLocation = ($ '.js-contribution-graph').find 'h2'
 
     # Inject toggle
     htmlToggle = """
-      <span class="ic-toggle #{toggleClass}">
+      <span class="ic-toggle">
         <a href="#" class="ic-toggle-option tooltipped tooltipped-nw squares" data-ic-option="squares" aria-label="Normal chart view"></a>
         <a href="#" class="ic-toggle-option tooltipped tooltipped-nw cubes" data-ic-option="cubes" aria-label="Isometric chart view"></a>
       </span>
@@ -254,14 +249,14 @@ class Iso
     ($ html).appendTo $ '.ic-contributions-wrapper'
 
   renderIsometricChart: ->
-    SIZE       = 12
+    SIZE       = 10
     GH_OFFSET  = 13
     MAX_HEIGHT = 100
 
     canvas = document.getElementById 'isometric-contributions'
 
     # create pixel view container in point
-    point = new obelisk.Point 87, 100
+    point = new obelisk.Point 110, 110
     pixelView = new obelisk.PixelView canvas, point
 
     contribCount = null