Adapt code to new html structure. Also: integrate parts of the code into new structure. see first part of issue #1.
Adapt code to new html structure. Also: integrate parts of the code into new structure.
see first part of issue #1.