Revert "Merge pull request #21 from TheArchitects/view-refactoring"

This reverts commit fa5bbb25c26b509bc85da65039749575a13a54c8, reversing
changes made to 50e5ff597c829757647f533e671018847076a684.
Merge master to branch