Task view refactored