Finishing everything on the front end!
Merge branch 'master' of https://github.com/UMCompass/Horizon