Added Task view + minor changes