Rearranged the HTML stuff