modified some of the pages and did some controller tests