diff --git a/changelog.html b/changelog.html
index 84f783fc..8ea4834c 100644
--- a/changelog.html
+++ b/changelog.html
@@ -1,3 +1,9 @@
+<div class="list-header">3.5.380 <time datetime="2016-11-23">(2016-11-23)</time></div>
+<ul class="chat-menu-content menu-side-padding">
+	<li>Fixed: Lazy load bits rendering information to avoid a race condition.</li>
+	<li>Fixed: Hook the new scrolling logic in the Ember service layout.</li>
+</ul>
+
 <div class="list-header">3.5.379 <time datetime="2016-11-23">(2016-11-23)</time></div>
 <ul class="chat-menu-content menu-side-padding">
 	<li>Changed: Minor refactor to bits rendering.</li>
diff --git a/src/ember/bits.js b/src/ember/bits.js
index 7decec3f..e6e3391c 100644
--- a/src/ember/bits.js
+++ b/src/ember/bits.js
@@ -91,7 +91,15 @@ FFZ.prototype.setup_bits = function() {
 		return this.error("Unable to locate the Ember service:bits-rendering-config");
 
 	Service.reopen({
+		ffz_has_css: false,
+
 		ffz_get_tier: function(prefix, amount) {
+			if ( ! this.get('isLoaded') ) {
+				this._actionPromiseCache = false;
+				this.loadRenderConfig();
+			} else if ( ! this.ffz_has_css )
+				this.ffz_update_css();
+
 			var config = this._getConfigPrefix(prefix) || {},
 				tiers = config.tiers || [],
 				tier = null,
@@ -157,12 +165,17 @@ FFZ.prototype.setup_bits = function() {
 			}
 
 			utils.update_css(f._chat_style, 'bit-styles', output.join(''));
+			this.ffz_has_css = true;
+		}.observes('config'),
 
-		}.observes('config')
+		loadRenderConfig: function() {
+			var out = this._super();
+			if ( ! this.get('config') )
+				this._actionPromiseCache = false;
+			return out;
+		}
 	});
 
-	if ( ! Service.get('isLoaded') )
+	if ( Service.get('isLoaded') )
 		Service.loadRenderConfig();
-	else
-		Service.ffz_update_css();
 }
\ No newline at end of file
diff --git a/src/ember/layout.js b/src/ember/layout.js
index 04a94b5a..f4a0ed81 100644
--- a/src/ember/layout.js
+++ b/src/ember/layout.js
@@ -1,5 +1,7 @@
 var FFZ = window.FrankerFaceZ,
-	utils = require('../utils');
+	utils = require('../utils'),
+
+	route_helper;
 
 
 // --------------------
@@ -169,6 +171,12 @@ FFZ.prototype.setup_layout = function() {
 	s.id = 'ffz-layout-css';
 	document.head.appendChild(s);
 
+	try {
+		route_helper = window.require("web-client/utilities/route-matcher");
+	} catch(err) {
+		this.error("Unable to require the route-matcher utility.", err);
+	}
+
 	var Layout = utils.ember_lookup('service:layout'),
 		f = this;
 
@@ -183,6 +191,15 @@ FFZ.prototype.setup_layout = function() {
 
 		portraitVideoBelow: false,
 
+		channelCoverHeight: function() {
+			var setting = f.settings.hide_channel_banner,
+				banner_hidden = setting === 1 ? f.settings.channel_bar_bottom : setting > 0;
+
+			return ( banner_hidden || ! route_helper || route_helper.routeMatches && route_helper.routeMatches(this.get('globals.currentPath'), route_helper.ROUTES.CHANNEL_ANY) ) ?
+				0 : 380;
+
+		}.property("globals.currentPath"),
+
 		portraitMode: function() {
 			var raw = this.get("rawPortraitMode");
 			this.set('portraitVideoBelow', raw === 3 || raw === 4);
diff --git a/src/main.js b/src/main.js
index f2bc7423..4cb8f127 100644
--- a/src/main.js
+++ b/src/main.js
@@ -61,7 +61,7 @@ FFZ.channel_metadata = {};
 
 // Version
 var VER = FFZ.version_info = {
-	major: 3, minor: 5, revision: 379,
+	major: 3, minor: 5, revision: 380,
 	toString: function() {
 		return [VER.major, VER.minor, VER.revision].join(".") + (VER.extra || "");
 	}