Refactor front.
Merge pull request #9 from fhacktory/refactor-front

Refactor front.