Added todo list
Screens.py refactored