         }
         pinViewContainer.constrain(toSuperviewEdges: nil)
 
-        topControlTop = topControlContainer.topAnchor.constraint(equalTo: view.topAnchor, constant: E.isIPhoneX ? C.padding[1] + 35.0 : C.padding[1] + 20.0)
-        topControlContainer.constrain([
+        topControlTop = logo.topAnchor.constraint(equalTo: view.topAnchor, constant: topControlHeight + (E.isIPhoneX ? C.padding[9] + 35.0 : C.padding[9] + 20.0))
+        logo.constrain([
             topControlTop,
-            topControlContainer.leadingAnchor.constraint(equalTo: view.leadingAnchor, constant: C.padding[2]),
-            topControlContainer.trailingAnchor.constraint(equalTo: view.trailingAnchor, constant: -C.padding[2]),
-            topControlContainer.heightAnchor.constraint(equalToConstant: topControlHeight) ])
-        addressButton.constrain([
-            addressButton.leadingAnchor.constraint(equalTo: topControlContainer.leadingAnchor),
-            addressButton.topAnchor.constraint(equalTo: topControlContainer.topAnchor),
-            addressButton.trailingAnchor.constraint(equalTo: topControlContainer.centerXAnchor),
-            addressButton.bottomAnchor.constraint(equalTo: topControlContainer.bottomAnchor) ])
-        scanButton.constrain([
-            scanButton.leadingAnchor.constraint(equalTo: topControlContainer.centerXAnchor),
-            scanButton.topAnchor.constraint(equalTo: topControlContainer.topAnchor),
-            scanButton.trailingAnchor.constraint(equalTo: topControlContainer.trailingAnchor),
-            scanButton.bottomAnchor.constraint(equalTo: topControlContainer.bottomAnchor) ])
-
-        logo.constrain([
-            logo.topAnchor.constraint(equalTo: topControlContainer.bottomAnchor, constant: C.padding[8]),
             logo.centerXAnchor.constraint(equalTo: view.centerXAnchor),
             logo.heightAnchor.constraint(equalTo: logo.widthAnchor, multiplier: C.Sizes.logoAspectRatio),
             logo.widthAnchor.constraint(equalTo: view.widthAnchor, multiplier: 0.35) ])

            activityView.startAnimating()
        }
        subheader.text = S.UnlockScreen.subheader

        addressButton.addTarget(self, action: #selector(addressTapped), for: .touchUpInside)
        scanButton.addTarget(self, action: #selector(scanTapped), for: .touchUpInside)
    }

    private func addBiometricsButton() {

            lock.centerXAnchor.constraint(equalTo: label.centerXAnchor) ])
        view.layoutIfNeeded()
        
        //let nc = self.presentingViewController as? RootNavigationController

        UIView.spring(0.6, animations: {
            self.pinPadPottom?.constant = self.pinPad.height
