Better color match
Better spacing
Added Location to events on calendar