Whitespace and tidy-up
Replaced testing values
Changed ordering and added element classes