diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9959767c087..586cf96f56e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,10 @@
-# 3.0.0 (unrelased master branch)
+# 3.0.0-beta2 (unreleased)
+
+### Bug fixes
+* **Dashboard**: Fixed dashboard panel layout for mobile devices, fixes [#4529](https://github.com/grafana/grafana/issues/4529)
+* **Page Load Crash**: A Datasource with null jsonData would make Grafana fail to load page, fixes [#4536](https://github.com/grafana/grafana/issues/4536)
+
+# 3.0.0-beta1 (2016-03-31)
 
 ### New Features
 * **Playlists**: Playlists can now be persisted and started from urls, closes [#3655](https://github.com/grafana/grafana/issues/3655)
diff --git a/package.json b/package.json
index ad4840144dc..4b526f5a4f3 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
     "company": "Coding Instinct AB"
   },
   "name": "grafana",
-  "version": "3.0.0-beta1",
+  "version": "3.0.0-beta2",
   "repository": {
     "type": "git",
     "url": "http://github.com/grafana/grafana.git"
diff --git a/pkg/api/frontendsettings.go b/pkg/api/frontendsettings.go
index c84d7faccff..f23f416b47a 100644
--- a/pkg/api/frontendsettings.go
+++ b/pkg/api/frontendsettings.go
@@ -59,7 +59,7 @@ func getFrontendSettingsMap(c *middleware.Context) (map[string]interface{}, erro
 			defaultDatasource = ds.Name
 		}
 
-		if len(ds.JsonData.MustMap()) > 0 {
+		if ds.JsonData != nil {
 			dsMap["jsonData"] = ds.JsonData
 		}
 
diff --git a/public/sass/_grafana.scss b/public/sass/_grafana.scss
index c7b4567bfb5..900d0c00f80 100644
--- a/public/sass/_grafana.scss
+++ b/public/sass/_grafana.scss
@@ -17,6 +17,7 @@
 @import "base/grid";
 @import "base/font_awesome";
 @import "base/grafana_icons";
+@import "base/code";
 
 // UTILS
 @import "utils/utils";
diff --git a/public/sass/_old_responsive.scss b/public/sass/_old_responsive.scss
index a7b2917277a..899a785c19b 100644
--- a/public/sass/_old_responsive.scss
+++ b/public/sass/_old_responsive.scss
@@ -7,8 +7,8 @@
 // ---------------------
 @include media-breakpoint-down(sm) {
   div.panel {
-    width: 100%;
-    padding: 0px;
+    width: 100% !important;
+    padding: 0px !important;
   }
   .panel-margin {
     margin-right: 0;
diff --git a/public/sass/base/_code.scss b/public/sass/base/_code.scss
index db7a8cfab18..2a4057a8547 100644
--- a/public/sass/base/_code.scss
+++ b/public/sass/base/_code.scss
@@ -11,28 +11,28 @@ pre {
   background-color: $code-tag-bg;
   color: $text-color;
   border: 1px solid darken($code-tag-bg, 15%);
-  padding: 2px;
+  padding: 10px;
+  border-radius: 4px;
 }
 
 // Inline code
 code {
-  color: #d14;
-  background-color: #f7f7f9;
-  border: 1px solid #e1e1e8;
+  color: $text-color;
+  background-color: $code-tag-bg;
+  border: 1px solid darken($code-tag-bg, 15%);
   white-space: nowrap;
 }
 
 // Blocks of code
 pre {
   display: block;
-  margin: 0 0 $line-height-base / 2;
-  font-size: $font-size-base - 1; // 14px to 13px
+  margin: 0 0 $line-height-base;
   line-height: $line-height-base;
   word-break: break-all;
   word-wrap: break-word;
   white-space: pre;
   white-space: pre-wrap;
-  background-color: #f5f5f5;
+  background-color: $code-tag-bg;
 
   // Make prettyprint styles more spaced out for readability
   &.prettyprint {