Major UI restructuring.
Merge branch 'master' of https://github.com/kaplanm99/LogiCal