Add sorter and a better look
Merge branch 'master' of https://github.com/gabre/calendar-repo