diff --git a/src/index.html b/src/index.html
index 5598fed5..29efef69 100755
--- a/src/index.html
+++ b/src/index.html
@@ -16,7 +16,7 @@
 	<meta name="apple-mobile-web-app-status-bar-style" content="#121212" />
 	<meta name="mobile-web-app-capable" content="yes" />
 	<meta name="theme-color" content="#222222" />
-	
+
 	<!-- Icons -->
 	<link rel="apple-touch-startup-image" href="/iris/assets/app-icon_512.png" />
 	<link rel="apple-touch-icon" sizes="192x192" href="/iris/assets/app-icon_192.png" />
@@ -30,7 +30,7 @@
 
 	<!-- Loading screen styles -->
 	<style>
-		html {			
+		html {
 			background-color: #121212;
 		}
 		@keyframes loader {
@@ -52,7 +52,7 @@
 		#app-loading::before {
 			position: absolute;
 			display: block;
-			content: '';			
+			content: '';
 			height: 100%;
 		    animation-name: loader;
 		    background: #444444;
@@ -104,17 +104,22 @@
 	var version = "VERSION_HERE";
 
 	// Construct the script tag
-    var js = document.createElement("script");
-    js.type = "application/javascript";
+	var js = document.createElement("script");
+	js.type = "application/javascript";
 
-    // Construct our css tag
-    var css = document.createElement("link");
-    css.rel = "stylesheet";
+	// Construct our css tag
+	var css = document.createElement("link");
+	css.rel = "stylesheet";
 
-    // Check for test mode. This is toggled under Settings > Debug > Test mode
-    try {
-	    var ui = JSON.parse(localStorage.getItem('ui') );
-	    var test_mode = (typeof(ui) !== 'undefined' && ui && typeof(ui.test_mode) !== 'undefined' && ui.test_mode);
+	// Check for test mode. This is toggled under Settings > Debug > Test mode
+	try {
+		var ui = JSON.parse(localStorage.getItem('ui') );
+		var test_mode = (
+			typeof(ui) !== 'undefined'
+			&& ui
+			&& typeof(ui.test_mode) !== 'undefined'
+			&& ui.test_mode
+		);
 	} catch(error){
 		console.error(error);
 		var test_mode = false;
diff --git a/src/js/App.js b/src/js/App.js
index d096edcc..b45054ad 100755
--- a/src/js/App.js
+++ b/src/js/App.js
@@ -77,10 +77,7 @@ export class App extends React.Component {
   }
 
   componentDidMount() {
-    const { 
-      location: {
-        search,
-      },
+    const {
       history,
       snapcast_enabled,
       allow_reporting,
@@ -111,20 +108,7 @@ export class App extends React.Component {
     }
     coreActions.getBroadcasts();
 
-    // Check for url-parsed configuration values
-    const customHost = helpers.queryString('host', search);
-    const customPort = helpers.queryString('port', search);
-    if (customHost && customPort) {
-      mopidyActions.set({ host: customHost, port: customPort });
-      uiActions.set({ initial_setup_complete: true });
-
-      // Allow 100ms for the action above to complete before we re-route
-      setTimeout(() => {
-        history.push('/');
-      }, 100);
-
-    // Just show default initial setup for fresh installs
-    } else if (!initial_setup_complete) {
+    if (!initial_setup_complete) {
       history.push('/initial-setup');
     }
   }
diff --git a/src/js/components/Parallax.js b/src/js/components/Parallax.js
index 0fa95f8b..db2a1171 100755
--- a/src/js/components/Parallax.js
+++ b/src/js/components/Parallax.js
@@ -10,6 +10,7 @@ export default class Parallax extends React.Component {
     this.state = {
       loaded: false,
       url: null,
+      outgoingUrl: null,
     };
   }
 
@@ -20,7 +21,7 @@ export default class Parallax extends React.Component {
   }
 
   componentWillReceiveProps(nextProps) {
-    if (nextProps.image != this.state.url) {
+    if (nextProps.image !== this.state.url) {
       this.loadImage(nextProps.image);
     }
   }
@@ -53,26 +54,26 @@ export default class Parallax extends React.Component {
   }
 
   render() {
-    let class_name = 'parallax preserve-3d';
-    if (this.props.blur) {
-      class_name += ' parallax--blur';
-    }
-    if (this.state.loaded) {
-      class_name += ' parallax--loaded';
-    }
-    if (this.props.fixedHeight) {
-      class_name += ' parallax--fixed-height';
-    } else {
-      class_name += ' parallax--flexible-height';
-    }
+    const {
+      blur,
+      fixedHeight,
+      animate = true,
+    } = this.props;
+    const {
+      loaded,
+      url,
+    } = this.state;
 
-    let style = {};
-    if (this.state.loaded && this.state.url) {
-      style = { backgroundImage: `url("${this.state.url}")` };
-    }
+    let className = 'parallax preserve-3d';
+    className += ` parallax--${fixedHeight ? 'fixed' : 'flexible'}-height`;
+    if (blur) className += ' parallax--blur';
+    if (loaded) className += ' parallax--loaded';
+    if (animate) className += ' parallax--animate';
+
+    const style = loaded && url ? { backgroundImage: `url("${url}")` } : {};
 
     return (
-      <div className={class_name}>
+      <div className={className}>
         <div className="parallax__layer preserve-3d">
           <div className="parallax__image" style={style} />
           <div className="parallax__overlay" />
diff --git a/src/js/views/Queue.js b/src/js/views/Queue.js
index da56c745..7051ade0 100755
--- a/src/js/views/Queue.js
+++ b/src/js/views/Queue.js
@@ -233,7 +233,7 @@ class Queue extends React.Component {
           <Icon name="play_arrow" type="material" />
           Now playing
         </Header>
-        <Parallax blur image={current_track_image} />
+        <Parallax image={current_track_image} blur />
         <div className="content-wrapper">
           <div className="current-track">
             {this.renderArtwork(current_track_image)}
diff --git a/src/js/views/modals/InitialSetup.js b/src/js/views/modals/InitialSetup.js
index e9367fa3..816da54e 100755
--- a/src/js/views/modals/InitialSetup.js
+++ b/src/js/views/modals/InitialSetup.js
@@ -15,16 +15,35 @@ class InitialSetup extends React.Component {
   constructor(props) {
     super(props);
 
+    const {
+      host,
+      port,
+      username,
+      allow_reporting,
+    } = props;
+
     this.state = {
-      username: this.props.username,
-      allow_reporting: this.props.allow_reporting,
-      host: this.props.host,
-      port: this.props.port,
+      username,
+      allow_reporting,
+      host,
+      port,
     };
   }
 
   componentDidMount() {
-    this.props.uiActions.setWindowTitle('Welcome to Iris');
+    const {
+      location: {
+        search,
+      },
+      uiActions,
+    } = this.props;
+
+    // Check for url-parsed configuration values
+    const customHost = helpers.queryString('host', search);
+    const customPort = helpers.queryString('port', search);
+
+    this.setState({ host: customHost, port: customPort });
+    uiActions.setWindowTitle('Welcome to Iris');
   }
 
   handleSubmit(e) {
@@ -49,7 +68,7 @@ class InitialSetup extends React.Component {
     this.setState({ saving: true });
 
     // Wait a jiffy to allow changes to apply to store
-    setTimeout(() => {
+    setTimeout(() => {
       // We've changed a connection setting, so need to reload
       if (self.state.host !== self.props.host || self.state.port !== self.props.port) {
         window.location = '/';
@@ -78,7 +97,7 @@ class InitialSetup extends React.Component {
               <input
                 type="text"
                 onChange={(e) => this.setState({ username: e.target.value.replace(/\W/g, '') })}
-                value={this.state.username}
+                value={this.state.username}
               />
               <div className="description">
 								A non-unique string used to identify this client (no special characters)
@@ -92,7 +111,7 @@ class InitialSetup extends React.Component {
               <input
                 type="text"
                 onChange={(e) => this.setState({ host: e.target.value })}
-                value={this.state.host}
+                value={this.state.host}
               />
             </div>
           </div>
@@ -102,12 +121,12 @@ class InitialSetup extends React.Component {
               <input
                 type="text"
                 onChange={(e) => this.setState({ port: e.target.value })}
-                value={this.state.port}
+                value={this.state.port}
               />
             </div>
           </div>
 
-          {helpers.isHosted() ? null : (
+          {helpers.isHosted() ? null : (
             <div className="field checkbox">
               <div className="input">
                 <label>
@@ -115,21 +134,21 @@ class InitialSetup extends React.Component {
                     type="checkbox"
                     name="allow_reporting"
                     checked={this.state.allow_reporting}
-                    onChange={(e) => this.setState({ allow_reporting: !this.state.allow_reporting })}
+                    onChange={(e) => this.setState({ allow_reporting: !this.state.allow_reporting })}
                   />
                   <span className="label">
 									Allow reporting of anonymous usage statistics
                   </span>
                 </label>
-                <p className="description">
-This anonymous usage data is important in identifying errors and potential features that make Iris better for everyone. Want to know more? Read the
-                  <a href="https://github.com/jaedb/Iris/wiki/Terms-of-use#privacy-policy" target="_blank">privacy policy</a>
-                  {!this.state.allow_reporting ? <span className="red-text"> Are you sure you don't want to support this?</span> : null}
-.
-                  {' '}
+                <p className="description">
+This anonymous usage data is important in identifying errors and potential features that make Iris better for everyone. Want to know more? Read the
+                  <a href="https://github.com/jaedb/Iris/wiki/Terms-of-use#privacy-policy" target="_blank">privacy policy</a>
+                  {!this.state.allow_reporting ? <span className="red-text"> Are you sure you don't want to support this?</span> : null}
+.
+                  {' '}
                 </p>
               </div>
-            </div>
+            </div>
           )}
 
           <div className="actions centered-text">
@@ -158,4 +177,4 @@ const mapDispatchToProps = (dispatch) => ({
   mopidyActions: bindActionCreators(mopidyActions, dispatch),
 });
 
-export default connect(mapStateToProps, mapDispatchToProps)(InitialSetup);
+export default connect(mapStateToProps, mapDispatchToProps)(InitialSetup);
diff --git a/src/scss/components/_parallax.scss b/src/scss/components/_parallax.scss
index 9f930a1a..1291b4d7 100755
--- a/src/scss/components/_parallax.scss
+++ b/src/scss/components/_parallax.scss
@@ -27,7 +27,6 @@ $parallax: 'parallax';
 	}
 
 	&__image {
-		@include animate(0.5s);
 		position: absolute;
 		top: -10px;
 		left: -10px;
@@ -40,6 +39,12 @@ $parallax: 'parallax';
 		z-index: 1;
 	}
 
+	&--animate {
+		.#{$parallax}__image {
+			@include animate(0.5s);
+		}
+	}
+
 	&__overlay {
 		content: '';
 		display: block;