Added more views and states