Merge pull request #23 from Phil0xF7/master

Updated and cleaned up new task views