HTML structure changes

- now uses divs with class names instead of definition list (it should
have been this all along) so now code will validate
Merge branch 'v1.1' into dev