Fixing spacing and headers