Updated HTML and Added Variables