Reorganize screen size variables
Improve watch task