Added today view
Minor tweak to today view
Added upcoming view