diff --git a/home/user/.config/sway/autostart.conf b/home/user/.config/sway/autostart.conf
index a44f75e..647f2aa 100644
--- a/home/user/.config/sway/autostart.conf
+++ b/home/user/.config/sway/autostart.conf
@@ -9,5 +9,3 @@ exec swayidle -w \
 # Notifications
 #systemctl --user enable --now dbus.service
 exec --no-startup-id mako
-
-exec --no-startup-id layout_change_handler
diff --git a/home/user/.config/sway/bar.conf b/home/user/.config/sway/bar.conf
new file mode 100644
index 0000000..ae27de8
--- /dev/null
+++ b/home/user/.config/sway/bar.conf
@@ -0,0 +1,10 @@
+# vim: ft=swayconfig
+# Sway bar
+
+bar {
+    position bottom
+    status_command i3blocks
+}
+
+
+exec --no-startup-id layout_change_handler
diff --git a/home/user/.config/sway/config b/home/user/.config/sway/config
index 1870b33..fc8b288 100644
--- a/home/user/.config/sway/config
+++ b/home/user/.config/sway/config
@@ -15,6 +15,7 @@
 
 include ~/.config/sway/bindings.conf
 include ~/.config/sway/autostart.conf
+include ~/.config/sway/bar.conf
 include ~/.config/sway/other.conf
 
 include ~/.config/sway/config.d/*.conf
diff --git a/home/user/.config/sway/other.conf b/home/user/.config/sway/other.conf
index a589cf6..394e6b1 100644
--- a/home/user/.config/sway/other.conf
+++ b/home/user/.config/sway/other.conf
@@ -24,12 +24,6 @@ for_window [title="Picture-in-Picture"] border pixel 0
 no_focus [title="^Peek preview$"]
 no_focus [class="feh"]
 
-
-bar {
-    position bottom
-    status_command i3blocks
-}
-
 output * bg "$(find ~/.wallpaper -type f | shuf -n 1)" fill
 
 exec_always test -f ~/.Xresources && xrdb -merge ~/.Xresources
diff --git a/home/user/.local/bin/switch-layout b/home/user/.local/bin/switch-layout
deleted file mode 100755
index 51f55ae..0000000
--- a/home/user/.local/bin/switch-layout
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-echo "here" > /tmp/test
-
-current=$(setxkbmap -query | grep layout | awk '{print $2}')
-
-if [ "${current}" = "us" ]; then
-    setxkbmap -model pc105 -option ctrl:nocaps ru
-else
-    setxkbmap -model pc105 -option ctrl:nocaps us
-fi