HTML architecture improvement