A lot of changes for cleaning up site presentation/logic and also added ITS-only capability