Made some quality of life changes for layout and took out phase 2 features until they are ready to be implemented