Fixed errors except for ToggleDayBlock