1. theme added to ManualTask
2. refactoring
3. view implementation