heavily refactored selectors and fixed task view