diff --git a/MTMR/CustomButtonTouchBarItem.swift b/MTMR/CustomButtonTouchBarItem.swift
index 298ade0..300e8fe 100644
--- a/MTMR/CustomButtonTouchBarItem.swift
+++ b/MTMR/CustomButtonTouchBarItem.swift
@@ -27,6 +27,7 @@ class CustomButtonTouchBarItem: NSCustomTouchBarItem, NSGestureRecognizerDelegat
         button.cell?.title = title
         button.title = title
         
+        button.bezelStyle = .rounded
         button.bezelColor = bezelColor
         self.view = button
         
@@ -91,13 +92,21 @@ class CustomButtonCell: NSButtonCell {
         super.init(textCell: "")
         if backgroundColor != .clear {
             self.isBordered = true
-            self.bezelStyle = .rounded
             self.backgroundColor = backgroundColor
         } else {
             self.isBordered = false
         }
     }
     
+    override func highlight(_ flag: Bool, withFrame cellFrame: NSRect, in controlView: NSView) {
+        if flag {
+            self.isBordered = true
+        } else {
+            self.isBordered = false
+        }
+        super.highlight(flag, withFrame: cellFrame, in: controlView)
+    }
+    
     required init(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
diff --git a/MTMR/Info.plist b/MTMR/Info.plist
index cd19220..3e1f8fb 100644
--- a/MTMR/Info.plist
+++ b/MTMR/Info.plist
@@ -26,8 +26,12 @@
 	<true/>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2018 Anton Palgunov. All rights reserved.</string>
+	<key>NSLocationAlwaysUsageDescription</key>
+	<string>Weather widget need your location for correct work</string>
 	<key>NSLocationUsageDescription</key>
-	<string>...</string>
+	<string>Weather widget need your location for correct work</string>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string>Weather widget need your location for correct work</string>
 	<key>NSMainStoryboardFile</key>
 	<string>Main</string>
 	<key>NSPrincipalClass</key>
diff --git a/MTMR/ScrollViewItem.swift b/MTMR/ScrollViewItem.swift
index 850039b..c4fc12c 100644
--- a/MTMR/ScrollViewItem.swift
+++ b/MTMR/ScrollViewItem.swift
@@ -10,7 +10,7 @@ class ScrollViewItem: NSCustomTouchBarItem {
         stackView.orientation = .horizontal
         let scrollView = NSScrollView(frame: CGRect(origin: .zero, size: stackView.fittingSize))
         scrollView.documentView = stackView
-        scrollView.documentView?.bounds.origin = CGPoint(x: 0.0, y: -2.5)
+//        scrollView.documentView?.bounds.origin = CGPoint(x: 0.0, y: -2.5)
         self.view = scrollView
     }
     
diff --git a/MTMR/TouchBarController.swift b/MTMR/TouchBarController.swift
index f65ec25..a3b28ca 100644
--- a/MTMR/TouchBarController.swift
+++ b/MTMR/TouchBarController.swift
@@ -215,6 +215,7 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
             let button = item.button!
             button.imageScaling = .scaleProportionallyDown
             button.imagePosition = .imageLeading
+            button.imageHugsTitle = true
             button.cell?.image = source.image
             button.bezelColor = .clear
         }
diff --git a/MTMR/Widgets/InputSourceBarItem.swift b/MTMR/Widgets/InputSourceBarItem.swift
index c56e26e..f32abd0 100644
--- a/MTMR/Widgets/InputSourceBarItem.swift
+++ b/MTMR/Widgets/InputSourceBarItem.swift
@@ -31,6 +31,10 @@ class InputSourceBarItem: CustomButtonTouchBarItem {
         fatalError("init(coder:) has not been implemented")
     }
     
+    deinit {
+        CFNotificationCenterRemoveEveryObserver(notificationCenter, UnsafeRawPointer(Unmanaged.passUnretained(self).toOpaque()));
+    }
+    
     @objc override func handleGestureSingle(gr: NSClickGestureRecognizer) {
         super.handleGestureSingle(gr: gr)
         switchInputSource()