Added tasks and states views