Removed calendar sorting and fixed upcoming events block. Fixes #1761.