rebased html changes from way upstream