Moved tasks to page.py
Cleanup