diff --git a/ckan/public/base/css/main.css b/ckan/public/base/css/main.css
index c5abc691441..39321bfe0c8 100644
--- a/ckan/public/base/css/main.css
+++ b/ckan/public/base/css/main.css
@@ -4506,13 +4506,13 @@ ul.icons li .icon-large:before {
 .simple-list:after {
   clear: both;
 }
-.simple-list > li {
+.simple-list  > li {
   font-size: 12px;
   line-height: 1.1666666666666667em;
   padding: 7px 25px;
   border-bottom: 1px dotted #cccccc;
 }
-.simple-list > li:last-of-type {
+.simple-list  > li:last-of-type {
   border-bottom: 0;
 }
 .simple-list .ckan-icon {
@@ -4669,6 +4669,8 @@ ul.icons li .icon-large:before {
   padding-right: 15px;
 }
 .module-grid {
+  margin: 0;
+  list-style: none;
   margin: 0;
   list-style: none;
   *zoom: 1;
@@ -4692,6 +4694,7 @@ ul.icons li .icon-large:before {
   padding-left: 20px;
   padding-bottom: 25px;
   float: left;
+  float: left;
   margin-left: 20px;
   width: 460px;
   padding-top: 10px;
@@ -4717,10 +4720,10 @@ ul.icons li .icon-large:before {
 .ckanext-datapreview {
   position: relative;
 }
-.ckanext-datapreview > iframe {
+.ckanext-datapreview  > iframe {
   min-height: 400px;
 }
-.ckanext-datapreview > img {
+.ckanext-datapreview  > img {
   max-height: 500px;
   max-width: 100%;
   overflow: hidden;
@@ -4884,13 +4887,13 @@ ol.media-grid:after {
 .nav-simple:after {
   clear: both;
 }
-.nav-simple > li {
+.nav-simple  > li {
   font-size: 12px;
   line-height: 1.1666666666666667em;
   padding: 7px 25px;
   border-bottom: 1px dotted #cccccc;
 }
-.nav-simple > li:last-of-type {
+.nav-simple  > li:last-of-type {
   border-bottom: 0;
 }
 .nav-simple .ckan-icon {
@@ -4912,10 +4915,12 @@ ol.media-grid:after {
 }
 .nav-item.active > a {
   background: url("../../../base/images/background-tag.png") no-repeat -13px center;
+  position: relative;
   display: block;
   font-size: 11px;
   line-height: 27px;
   color: #187794;
+  padding-left: 10px;
   padding-right: 5px;
   margin-right: 11px;
   -webkit-box-sizing: border-box;
@@ -5204,6 +5209,8 @@ textarea {
   background-image: url("../../../base/images/sprite-ckan-icons.png");
   background-repeat: no-repeat;
   background-position: 16px 16px;
+  width: 17px;
+  height: 17px;
   background-position: -51px -16px;
   position: absolute;
   display: block;
@@ -5797,6 +5804,8 @@ textarea {
   vertical-align: text-bottom;
   position: relative;
   top: 2px;
+  width: 16px;
+  height: 16px;
   background-image: url("../../../base/images/sprite-ckan-icons.png");
   background-repeat: no-repeat;
   background-position: 16px 16px;
@@ -6652,6 +6661,7 @@ li .icon-large:before {
   float: right;
 }
 [role=main] .secondary {
+  float: left;
   margin-left: 20px;
   width: 220px;
   margin-left: 0;
@@ -6750,7 +6760,11 @@ li .icon-large:before {
 .hero .tags .tag {
   margin-right: 15px;
 }
-.masthead {
+header.masthead {
+  *zoom: 1;
+  color: #ffffff;
+  padding: 5px 10px 3px;
+  height: 55px;
   background-color: #005974;
   background-image: -moz-linear-gradient(top, #005d7a, #00536b);
   background-image: -ms-linear-gradient(top, #005d7a, #00536b);
@@ -6760,53 +6774,32 @@ li .icon-large:before {
   background-image: linear-gradient(top, #005d7a, #00536b);
   background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#005d7a', endColorstr='#00536b', GradientType=0);
-  *zoom: 1;
-  color: #ffffff;
-  padding: 5px 10px 3px;
 }
-.masthead:before,
-.masthead:after {
+header.masthead:before,
+header.masthead:after {
   display: table;
   content: "";
 }
-.masthead:after {
+header.masthead:after {
   clear: both;
 }
-.masthead .container {
+header.masthead .container {
   position: relative;
 }
-.masthead a {
+header.masthead a {
   color: #ffffff;
 }
-.masthead hgroup,
-.masthead nav {
-  *zoom: 1;
-  min-height: 52px;
-  position: relative;
-  display: inline-block;
-}
-.masthead hgroup:before,
-.masthead nav:before,
-.masthead hgroup:after,
-.masthead nav:after {
-  display: table;
-  content: "";
-}
-.masthead hgroup:after,
-.masthead nav:after {
-  clear: both;
-}
-.masthead hgroup h1,
-.masthead hgroup h2 {
+header.masthead hgroup h1,
+header.masthead hgroup h2 {
+  float: left;
   font-size: 34px;
   line-height: 1.5;
-  float: left;
 }
-.masthead hgroup h1 {
-  font-family: "Arial Black", "Arial Bold", Gadget, sans-serif;
-  letter-spacing: -2px;
+header.masthead hgroup h1 {
+  font-weight: 900;
+  letter-spacing: -1px;
 }
-.masthead hgroup h2 {
+header.masthead hgroup h2 {
   position: absolute;
   bottom: -3px;
   left: 0;
@@ -6816,219 +6809,188 @@ li .icon-large:before {
   line-height: 1.2;
   white-space: nowrap;
 }
-.masthead .tagline-right h2 {
-  left: auto;
+header.masthead .content {
+  position: absolute;
+  top: 10px;
   right: 0;
 }
-.masthead hgroup a {
-  text-decoration: none;
-}
-.masthead .logo {
-  margin-right: 10px;
+header.masthead .section {
   float: left;
 }
-.masthead .logo img {
-  display: block;
+header.masthead .navigation {
+  margin-right: 20px;
 }
-.masthead .content {
-  position: absolute;
-  top: 8px;
-  right: 0;
-  bottom: 0;
-}
-.masthead .content > * {
-  float: right;
+header.masthead .navigation ul.unstyled {
+  *zoom: 1;
+  margin: 5px 0;
 }
-.masthead nav {
-  display: inline-block;
-  line-height: 40px;
+header.masthead .navigation ul.unstyled:before,
+header.masthead .navigation ul.unstyled:after {
+  display: table;
+  content: "";
 }
-.masthead nav ul {
-  margin: 0;
+header.masthead .navigation ul.unstyled:after {
+  clear: both;
 }
-.masthead nav li {
-  display: inline-block;
+header.masthead .navigation ul.unstyled li {
+  display: block;
+  float: left;
 }
-.masthead nav li a {
+header.masthead .navigation ul.unstyled li a {
   display: block;
   font-size: 12px;
   font-weight: bold;
   padding: 4px 10px;
-}
-.masthead nav li a.active {
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
   border-radius: 3px;
-  -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.3);
-  -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.3);
-  box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.3);
-  box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.3), 0 1px 0 rgba(255, 255, 255, 0.3);
-  background-color: rgba(255, 255, 255, 0.08);
-}
-.masthead .account {
-  position: relative;
-  padding-top: 7px;
 }
-.masthead .account.avatar {
-  padding-left: 55px;
-}
-.masthead .section {
-  margin-left: 20px;
-  padding-left: 20px;
-  min-height: 35px;
-}
-.masthead .section:before,
-.masthead .section:after {
-  content: "";
-  display: block;
-  position: absolute;
-  top: NaN;
-  left: 0;
-  bottom: NaN;
-  width: 1px;
-  background-color: #007094;
-  background-image: -webkit-gradient(radial, center center, 0, center center, 460, from(rgba(255, 255, 255, 0.1)), to(rgba(255, 255, 255, 0)));
-  background-image: -webkit-radial-gradient(circle, rgba(255, 255, 255, 0.1), rgba(255, 255, 255, 0));
-  background-image: -moz-radial-gradient(circle, rgba(255, 255, 255, 0.1), rgba(255, 255, 255, 0));
-  background-image: -ms-radial-gradient(circle, rgba(255, 255, 255, 0.1), rgba(255, 255, 255, 0));
-  background-image: -o-radial-gradient(circle, rgba(255, 255, 255, 0.1), rgba(255, 255, 255, 0));
-  background-color: rgba(255, 255, 255, 0.08000000000000002);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(rgba(255, 255, 255, 0)), color-stop(0.5, rgba(255, 255, 255, 0.1)), to(rgba(255, 255, 255, 0)));
-  background-image: -webkit-linear-gradient(rgba(255, 255, 255, 0), rgba(255, 255, 255, 0.1) 0.5, rgba(255, 255, 255, 0));
-  background-image: -moz-linear-gradient(top, rgba(255, 255, 255, 0), rgba(255, 255, 255, 0.1) 0.5, rgba(255, 255, 255, 0));
-  background-image: -ms-linear-gradient(rgba(255, 255, 255, 0), rgba(255, 255, 255, 0.1) 0.5, rgba(255, 255, 255, 0));
-  background-image: -o-linear-gradient(rgba(255, 255, 255, 0), rgba(255, 255, 255, 0.1) 0.5, rgba(255, 255, 255, 0));
-  background-image: linear-gradient(rgba(255, 255, 255, 0), rgba(255, 255, 255, 0.1) 0.5, rgba(255, 255, 255, 0));
-  background-repeat: no-repeat;
-  background-color: rgba(255, 255, 255, 0);
-}
-.masthead .section:after {
-  left: -1px;
-  background-color: #004a61;
-  background-image: -webkit-gradient(radial, center center, 0, center center, 460, from(rgba(0, 0, 0, 0.2)), to(rgba(0, 0, 0, 0)));
-  background-image: -webkit-radial-gradient(circle, rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0));
-  background-image: -moz-radial-gradient(circle, rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0));
-  background-image: -ms-radial-gradient(circle, rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0));
-  background-image: -o-radial-gradient(circle, rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0));
-  background-color: rgba(0, 0, 0, 0.16000000000000003);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(rgba(0, 0, 0, 0)), color-stop(0.5, rgba(0, 0, 0, 0.2)), to(rgba(0, 0, 0, 0)));
-  background-image: -webkit-linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.2) 0.5, rgba(0, 0, 0, 0));
-  background-image: -moz-linear-gradient(top, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.2) 0.5, rgba(0, 0, 0, 0));
-  background-image: -ms-linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.2) 0.5, rgba(0, 0, 0, 0));
-  background-image: -o-linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.2) 0.5, rgba(0, 0, 0, 0));
-  background-image: linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.2) 0.5, rgba(0, 0, 0, 0));
-  background-repeat: no-repeat;
-  background-color: rgba(0, 0, 0, 0);
+header.masthead .navigation ul.unstyled li a.active {
+  background-color: #0d6581;
+  box-shadow: 0 -1px 0 #084152, 0 1px 0 #26758e;
 }
-.masthead .section.first:after,
-.masthead .section.first:before {
-  content: none;
+header.masthead .site-search {
+  margin: 3px 0;
 }
-.masthead .navigation {
-  margin-right: -10px;
+header.masthead .site-search input {
+  width: 190px;
+  font-size: 11px;
+  padding: 4px;
 }
-.masthead .account .image {
-  position: absolute;
-  left: 10px;
-  top: 6px;
-  padding-right: 10px;
-  opacity: 0.8;
+header.masthead .account {
+  background: #003f52;
+  padding: 3px 5px;
+  margin: 2px 0 2px 30px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  -webkit-box-shadow: inset 0 2px 4px #002b38;
+  -moz-box-shadow: inset 0 2px 4px #002b38;
+  box-shadow: inset 0 2px 4px #002b38;
 }
-.masthead .account .image img {
-  -webkit-border-radius: 100px;
-  -moz-border-radius: 100px;
-  border-radius: 100px;
-  -webkit-box-shadow: 0 -2px 4px rgba(0, 0, 0, 0.3);
-  -moz-box-shadow: 0 -2px 4px rgba(0, 0, 0, 0.3);
-  box-shadow: 0 -2px 4px rgba(0, 0, 0, 0.3);
+header.masthead .account ul.unstyled {
+  *zoom: 1;
 }
-.masthead .account .image i {
-  position: absolute;
-  top: 0;
-  left: 30px;
-  line-height: 25px;
+header.masthead .account ul.unstyled:before,
+header.masthead .account ul.unstyled:after {
+  display: table;
+  content: "";
 }
-.masthead .account .image:hover {
-  opacity: 1;
+header.masthead .account ul.unstyled:after {
+  clear: both;
 }
-.masthead .account .image:hover i {
-  font-weight: normal;
-  text-decoration: none;
+header.masthead .account ul.unstyled li {
+  display: block;
+  float: left;
 }
-.masthead .account.open .image {
-  opacity: 1;
+header.masthead .account ul.unstyled li a {
+  display: block;
+  font-size: 12px;
+  font-weight: bold;
+  padding: 4px 10px;
 }
-.masthead .account.open .image img {
-  -webkit-box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.5);
-  -moz-box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.5);
-  box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.5);
+header.masthead .account ul.unstyled li a.sub {
+  font-weight: 300;
+  border-left: 1px solid #002b38;
 }
-.masthead .account .image img {
-  display: block;
+header.masthead .account .dropdown {
+  float: left;
 }
-.masthead .links {
+header.masthead .account .button {
   display: block;
-  position: relative;
-  top: -2px;
+  text-decoration: none;
+  background-color: #005d7a;
+  color: #80aebd;
+  text-shadow: 0 1px 1px #003647;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  -webkit-box-shadow: inset 0 1px 0 #007094;
+  -moz-box-shadow: inset 0 1px 0 #007094;
+  box-shadow: inset 0 1px 0 #007094;
 }
-.masthead .links a {
-  line-height: 13px;
-  float: left;
+header.masthead .account .image {
+  margin: 2px 0;
+  padding: 0 4px 0 0;
+  overflow: hidden;
+  font-size: 10px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
 }
-.masthead .links .sub {
-  font-size: 11px;
-  clear: left;
-  color: rgba(255, 255, 255, 0.6);
+header.masthead .account .image i {
+  vertical-align: -1px;
 }
-.masthead .dropdown-menu {
-  min-width: 130px;
-  margin-top: -5px;
+header.masthead .account .image img {
+  opacity: 0.7;
+  border-right: 1px solid #00536b;
+  -webkit-border-radius: 4px 0 0 4px;
+  -moz-border-radius: 4px 0 0 4px;
+  border-radius: 4px 0 0 4px;
 }
-.masthead .dropdown-menu li a {
-  color: #187794;
+header.masthead .account .notifications {
+  padding: 4px 8px 3px 8px;
+  margin: 2px 5px 2px 0;
 }
-.masthead .dropdown-menu li a i {
-  margin-right: 5px;
+header.masthead .account .notifications.notifications-important {
+  color: #ffffff;
+  background-color: #c9403a;
+  text-shadow: 0 1px 1px #a3322d;
+  -webkit-box-shadow: inset 0 1px 0 #ce534e;
+  -moz-box-shadow: inset 0 1px 0 #ce534e;
+  box-shadow: inset 0 1px 0 #ce534e;
+}
+header.masthead .account .dropdown.open .image img,
+header.masthead .account .dropdown .image:hover img {
+  opacity: 1;
+  border-right-color: #007b9e;
 }
-.masthead .dropdown-menu li a:hover {
+header.masthead .account .dropdown.open .button,
+header.masthead .account .dropdown .button:hover {
   color: #ffffff;
+  background-color: #669eaf;
+  -webkit-box-shadow: inset 0 1px 0 #80aebd;
+  -moz-box-shadow: inset 0 1px 0 #80aebd;
+  box-shadow: inset 0 1px 0 #80aebd;
+  text-decoration: none;
 }
-.masthead .site-search {
-  position: relative;
-  margin: 0;
-  margin-left: 20px;
-  padding: 0 0 0 20px;
+header.masthead .account .dropdown.open .notifications-important,
+header.masthead .account .dropdown .notifications-important:hover {
+  background-color: #d46762;
+  text-shadow: 0 1px 1px #c9403a;
+  -webkit-box-shadow: inset 0 1px 0 #d97a76;
+  -moz-box-shadow: inset 0 1px 0 #d97a76;
+  box-shadow: inset 0 1px 0 #d97a76;
 }
-.masthead .site-search .field {
-  padding: 0;
-  margin-top: 5px;
+header.masthead .account.authed {
+  margin: 0 0 0 30px;
 }
-.masthead .site-search input {
-  width: 190px;
-  font-size: 11px;
-  padding: 4px;
+header.masthead .account.not-authed {
+  padding-top: 2px;
+  padding-bottom: 2px;
 }
-.masthead .header-image {
-  font: inherit;
-  text-indent: -900em;
-  min-height: 50px;
+header.masthead .dropdown-menu {
+  margin-top: -1px;
 }
-.masthead .header-image .logo {
-  position: absolute;
-  top: 0;
-  left: 0;
-  display: block;
-  width: 240px;
-  height: 50px;
-  text-indent: 0;
+header.masthead .user-dropdown-menu a {
+  color: #005d7a;
+}
+header.masthead .user-dropdown-menu a:hover {
+  color: #ffffff;
 }
-.masthead .debug {
+header.masthead .debug {
   position: absolute;
-  top: 10px;
+  bottom: 10px;
   left: 10px;
+  font-size: 11px;
   color: rgba(255, 255, 255, 0.5);
+  line-height: 1.2;
 }
 .site-footer {
+  *zoom: 1;
+  color: #ffffff;
+  padding: 5px 10px 3px;
+  height: 55px;
   background-color: #005974;
   background-image: -moz-linear-gradient(top, #005d7a, #00536b);
   background-image: -ms-linear-gradient(top, #005d7a, #00536b);
@@ -7038,9 +7000,6 @@ li .icon-large:before {
   background-image: linear-gradient(top, #005d7a, #00536b);
   background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#005d7a', endColorstr='#00536b', GradientType=0);
-  *zoom: 1;
-  color: #ffffff;
-  padding: 5px 10px 3px;
   font-size: 12px;
   padding: 20px 0;
 }
@@ -7264,6 +7223,7 @@ li .icon-large:before {
   background: transparent url('../../../base/images/dotted.png') 14px 0 repeat-y;
 }
 .activity .item {
+  position: relative;
   margin: 0 0 15px 0;
   padding: 0;
   *zoom: 1;
@@ -7316,6 +7276,24 @@ li .icon-large:before {
   white-space: nowrap;
   margin-left: 5px;
 }
+.activity .item .new {
+  display: block;
+  position: absolute;
+  overflow: hidden;
+  top: -3px;
+  left: -3px;
+  width: 10px;
+  height: 10px;
+  background-color: #A35647;
+  border: 1px solid #FFF;
+  text-indent: -1000px;
+  -webkit-border-radius: 100px;
+  -moz-border-radius: 100px;
+  border-radius: 100px;
+  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
+  -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
+}
 .popover .about {
   margin-bottom: 10px;
 }
@@ -7383,6 +7361,9 @@ li .icon-large:before {
 .activity .item.new-related-item i {
   background-color: #95a669;
 }
+.activity .item.follow-group i {
+  background-color: #8ba669;
+}
 .popover-context-loading .popover-title {
   display: none;
 }
@@ -7405,6 +7386,9 @@ li .icon-large:before {
   -moz-border-radius: 100px;
   border-radius: 100px;
 }
+.module-my-datasets .empty {
+  padding: 10px;
+}
 body {
   background-color: #00536b;
 }
@@ -7537,6 +7521,20 @@ iframe {
   -moz-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
   box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
 }
+.ie7 .masthead nav ul li a.active,
+.ie8 .masthead nav ul li a.active {
+  position: relative;
+  top: -1px;
+  background-color: #006584;
+  border-top: 1px solid #00516b;
+  border-bottom: 1px solid #007094;
+}
+.ie8 .masthead .account a.image {
+  display: block;
+  width: 25px;
+  padding-right: 10px;
+  white-space: nowrap;
+}
 .ie7 .alert {
   position: relative;
 }
@@ -7620,6 +7618,10 @@ iframe {
 .ie7 .stages li .highlight {
   width: auto;
 }
+.ie7 .masthead {
+  position: relative;
+  z-index: 1;
+}
 .ie7 .masthead .logo img,
 .ie7 .masthead nav {
   *display: inline;
@@ -7643,6 +7645,9 @@ iframe {
 .ie7 .masthead .header-image {
   display: block;
 }
+.ie7 .masthead .account .dropdown-menu {
+  z-index: 10000;
+}
 .ie7 .footer-links {
   *zoom: 1;
 }
@@ -7657,10 +7662,6 @@ iframe {
 .ie7 .footer-links li {
   float: left;
 }
-.ie7 .nav-item.active > a {
-  background-image: url(../images/background-tag-ie7.png);
-  background-position: 0 0;
-}
 .ie7 .module-narrow .nav-item.image {
   *zoom: 1;
 }