Merge today, tomorrow, upcoming into one view, fixed #45 and #49