Calendar update

[jlang61]

Current calendar page looks like this.

• Delete upcomign events from top of screen - a bit redundant
• Use Events component

• Split into two columns - upcoming events and events component - for ease of visualization and understanding