Moved some things around in i3bar.