Fix float issues and reformat HTML