Task Manager configuration
   * small changes/code refactoring