Keep files clean and consistent

Move most of the html out of echo's for easier reading.
Move all curly braces inline.