Added View layout and improved view pages, setup better testing