diff --git a/install.sh b/install.sh
index 6fee402..9028770 100644
--- a/install.sh
+++ b/install.sh
@@ -207,10 +207,7 @@ echo "Decrypting.. This also might take a while."
 echo
 echo -en "${pwcr}\n${pwcr}" | cryptsetup luksOpen "/dev/${main}" main
 echo "Partition successfully opened."
-echo
-
-lsblk | grep "${dev}"
-echo
+clear
 
 ##########
 
@@ -245,10 +242,7 @@ mount -o autodefrag,compress=zstd:3,subvol=home "/dev/mapper/main" "/mnt/home"
 mkdir "/mnt/boot"
 mount "/dev/${boot}" "/mnt/boot"
 echo "Mounting complete."
-echo
-
-lsblk -a
-echo
+clear
 
 ##########
 
@@ -340,7 +334,7 @@ all_packages=(
 pacstrap "/mnt" "${all_packages[@]}"
 
 echo "Base system installed."
-echo
+clear
 
 ##########
 
@@ -375,15 +369,6 @@ arch-chroot "/mnt" localectl set-locale LANG=en_US.UTF-8
 
 echo "KEYMAP=de-latin1-nodeadkeys" > "/mnt/etc/vconsole.conf"
 arch-chroot /mnt localectl set-keymap --no-convert de-latin1-nodeadkeys
-
-# Create keyboard layout
-config_dir="/mnt/home/${user}/.config"
-mkdir -p "${config_dir}"
-cat << EOF > "${config_dir}/kxkbrc"
-[Layout]
-LayoutList=de
-Use=true
-EOF
 echo "Done."
 echo
 
@@ -469,6 +454,15 @@ arch-chroot /mnt useradd -m "${user}"
 echo -en "${pwur}\n${pwur}" | arch-chroot /mnt passwd "${user}"
 arch-chroot /mnt gpasswd -a "${user}" wheel
 sed -i '82s/.*/%wheel ALL=(ALL) ALL/' /mnt/etc/sudoers
+
+# Create keyboard layout
+config_dir="/mnt/home/${user}/.config"
+sudo -u "${user}" mkdir -p "${config_dir}"
+sudo -u "${user}" cat << EOF > "${config_dir}/kxkbrc"
+[Layout]
+LayoutList=de
+Use=true
+EOF
 echo "Done."
 echo