Actully fix spacing-

I also changed around some closing tags so it's a little nicer to understand