First pass changes for test website