Fixing spacing some more