Changes to task Handling
Layout changes and tests