             self.addSubview(self.overlay!)
         }
         else {
-            self.addSubview(self.keyView)
+            self.addSubview(self.background)
         }
         
         self.label.textAlignment = NSTextAlignment.Center

    func willHidePopup(key: KeyboardKey)
}

class KeyboardKey: UIControl, KeyboardView {
    
    var delegate: KeyboardKeyProtocol?
    
    var keyView: KeyboardKeyBackground
    var popup: KeyboardKeyBackground?
    var connector: KeyboardConnector?
    
    var label: UILabel
    var text: String {
        didSet {
            self.label.text = text

            if let delegate = self.delegate {
                let frame = delegate.frameForPopup(self, direction: dir)
                popup.frame = frame
                popupLabel?.frame = popup.bounds
            }
            else {
                popup.frame = CGRectZero
