Move HTML cleanups, update websites to use widget markup