diff --git a/src/js/components/ContextMenu.js b/src/js/components/ContextMenu.js
index 59a893ab..db4c42b7 100755
--- a/src/js/components/ContextMenu.js
+++ b/src/js/components/ContextMenu.js
@@ -218,12 +218,12 @@ class ContextMenu extends React.Component{
 		}
 
 		var className = 'context-menu'
-		var trigger = 'click'
 		if (this.props.emulate_touch) {
 			className += ' touch'
-			trigger = 'touch'
+			var trigger = 'touch'
 		} else {
 			className += ' '+this.props.context_menu.trigger
+			var trigger = this.props.context_menu.trigger
 		}
 
 		var items = this.getItems(trigger)
diff --git a/src/js/views/Settings.js b/src/js/views/Settings.js
index b730b117..11b81d0c 100755
--- a/src/js/views/Settings.js
+++ b/src/js/views/Settings.js
@@ -1,7 +1,7 @@
 
 import React, { PropTypes } from 'react'
 import { connect } from 'react-redux'
-import { browserHistory, Link } from 'react-router'
+import { hashHistory, Link } from 'react-router'
 import { bindActionCreators } from 'redux'
 import FontAwesome from 'react-fontawesome'
 
@@ -271,7 +271,7 @@ class Settings extends React.Component{
 						<div className="input">
 					        <ConfirmationButton className="destructive" content="Reset all settings" confirmingContent="Are you sure?" onConfirm={() => this.resetAllSettings()} />
 					        &nbsp;&nbsp;
-					        <button className="primary" onClick={ () => browserHistory.push(global.baseURL+'debug') }>
+					        <button className="primary" onClick={ () => hashHistory.push(global.baseURL+'debug') }>
 					        	<FontAwesome name="flask" />&nbsp;Debugger
 					        </button>
 			        	</div>
diff --git a/src/scss/components/_dropdown-field.scss b/src/scss/components/_dropdown-field.scss
index 2805e217..f61a8b53 100755
--- a/src/scss/components/_dropdown-field.scss
+++ b/src/scss/components/_dropdown-field.scss
@@ -32,14 +32,14 @@
 
 		.option {
 			position: relative;
-			padding: 10px 16px 10px 34px;
+			padding: 6px 14px 6px 30px;
 			border-top: 1px solid lighten($dark_grey, 10%);
 			cursor: pointer;
 
 			.fa {
 				position: absolute;
-				top: 13px;
-				left: 12px;
+				top: 12px;
+				left: 10px;
 				font-size: 12px;
 			}