HTML improvements 0.3