Add proper day class showing and date formatting
Merge conflicts