HTML Changes / Code clean-up