UI Work
Merge branch 'master' of github.com:spsnow/Syllabliss