#2 moved html code out of tables