UI again
Merge branch 'master' of https://github.com/mlapointe94/ThoughtCloud