Added visible days to 30 in scroller
Token now swapped on refocus, not just refresh