Minor sytlistic changes
Got label setting working on front-end
Merge branch 'master' of github.com:WheatonCS/Lexos