More HTML code swapped into templates (#68 again)