HTML bugs fixed