Move html out of php tags

Move most of the html out of echo's for easier reading.