Fixed old echo statements to new addHTML way