Add state validation to project and split views on state