rearranged html a bit to fit into new design