         cancelButton.hidden = true
         self.addSubview(cancelButton)
 
-        self.locationView.snp_remakeConstraints { make in
-            make.left.equalTo(self.snp_left).offset(DefaultPadding)
-            make.centerY.equalTo(self).offset(StatusBarHeight/2.0)
-        }
-
-        self.tabsButton.snp_remakeConstraints { make in
-            make.left.equalTo(self.locationView.snp_right).offset(8)
-            make.centerY.equalTo(self).offset(StatusBarHeight/2.0)
+        locationContainer.snp_remakeConstraints { make in
+            make.leading.equalTo(self).offset(DefaultPadding)
+            make.centerY.equalTo(self).offset(StatusBarHeight / 2.0)
+        }
+
+        locationView.snp_makeConstraints { make in
+            make.edges.equalTo(self.locationContainer)
+            return
+        }
+
+        tabsButton.snp_remakeConstraints { make in
+            make.leading.equalTo(self.locationContainer.snp_trailing).offset(8)
+            make.trailing.equalTo(self)
+            make.centerY.equalTo(self).offset(StatusBarHeight / 2.0)
             make.width.height.equalTo(ToolbarHeight)
-            make.right.equalTo(self)
-        }
-
-        self.progressBar.snp_remakeConstraints { make in
+        }
+
+        progressBar.snp_remakeConstraints { make in
             make.centerY.equalTo(self.snp_bottom)
             make.width.equalTo(self)
         }
 
         cancelButton.snp_makeConstraints { make in
-            make.centerY.equalTo(self).offset(StatusBarHeight/2.0)
+            make.centerY.equalTo(self).offset(StatusBarHeight / 2.0)
             make.right.equalTo(self).offset(-2)
         }
     }

    }

    private func initViews() {
        locationView = BrowserLocationView(frame: CGRectZero)
        locationView.readerModeState = ReaderModeState.Unavailable
        locationView.delegate = self
        addSubview(locationView)

        editTextField = ToolbarTextField()
        editTextField.keyboardType = UIKeyboardType.WebSearch


    private var locationView: BrowserLocationView!
    private var editTextField: ToolbarTextField!
    private var locationContainer: UIView!
    private var tabsButton: UIButton!
    private var progressBar: UIProgressView!
    private var cancelButton: UIButton!
