WI Refactor views to use sub classes