Fixed layout errors

Changed so the order of information is correct as well as spacing
between sections.