Updates to front end
Merge branch 'master' of https://github.com/EFJackson/SMS