Added fees display to Calendar
Merge branch 'calendar3'