Changes to new spot and some html changes as well