fixed the today bug

fixed today bug
Added helper view for clear
bugfix

bugfix
Merge remote-tracking branch 'origin/krystal'