More HTML improvements