Improved some things in i3