Self closed tags tidy

Some tags were self closed and others weren't. I made the choice to strip them all out to make the code cleaner.