Code review and possible small refactor of frontend

#1

@Adam_Soltys we should go over your frontend code and review it.

Week of 8/20/2018