Completely refactor app design
Merge pull request #2 from SteveVitali/master7

Completely refactor app design