some view page work
Another merge with Will and Sean