More work on whats on calendar
More work on calendar page