nextDAy button is working now
Code cleaned-up
code cleanup