More HTML cleanup (THANKS DAVID)