Updated HTML to layout better (again, with colors)