diff --git a/rc.lua b/rc.lua
index aabbddc..c3e3d74 100644
--- a/rc.lua
+++ b/rc.lua
@@ -143,22 +143,20 @@ end
 --	[9] = 'example2'
 --}
 tags[1].layout = {
-	[1] = layouts.tiled[1],
 	[2] = layouts.max[1],
-	[4] = layouts.float[1],
-	[5] = layouts.float[1]
+	[4] = layouts.float[1]
 }
 -- screens 2+
 if screen.count() >= 2 then
 	tags[2].layout = {
-		[3] = layouts.float[1]
+		[4] = layouts.float[1]
 	}
 end
 -- Fill the missing values with defaults
 for s = 1, screen.count() do
 	for tag = 1, 9 do
 		tags[s].name[tag] = tags[s].name[tag] or tag
-		tags[s].layout[tag] = tags[s].layout[tag] or layouts.tiled[2]
+		tags[s].layout[tag] = tags[s].layout[tag] or layouts.tiled[1]
 	end
 end
 -- Set tags instances in wm
@@ -571,7 +569,7 @@ awful.rules.rules = {
 			tag = tags[1][2]
 		}
 	},
-	-- tag 4: steam
+	-- tag 4: steam and games
 	{
 		rule_any = {
 			class = { 'Steam' },
@@ -579,7 +577,6 @@ awful.rules.rules = {
 		},
 		properties = { tag = tags[1][4] }
 	},
-	-- tag 5: mostly games, float / fullscreen
 	{
 		rule_any = {
 			class = {
@@ -610,7 +607,7 @@ awful.rules.rules = {
 		properties = {
 			border_width = 0,
 			floating = true,
-			tag = tags[1][5]
+			tag = tags[1][4]
 		}
 	}
 }
diff --git a/vimrc b/vimrc
index 24a39d0..16a004b 100644
--- a/vimrc
+++ b/vimrc
@@ -34,14 +34,10 @@ autocmd FileType python setlocal sts=4 sw=4 expandtab
 
 " maps
 nmap <Space> <C-W>
-nnoremap h <BS>
 nnoremap j gj
 nnoremap k gk
-nnoremap l <Space>
-vnoremap h <BS>
 vnoremap j gj
 vnoremap k gk
-vnoremap l <Space>
 
 " still have to deal with old vim versions :<
 if v:version >= 703