Reformatted and moved the html into actual HTML structures instead of
being written by echo.