Changed Html structure