Code review and possible small refactor of frontend

[Jehan]

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