Change html construction + bug fix