Refactored Tasks
Added dialog to add favorited trackable