Update UI, added elementary event support
Merge branch 'master' of https://github.com/DougBellinger/spark