#7 #18 tasks view refactoring