inherit application controller, layout
Merge pull request #54 from DonutWorks/fix/broken-design

Fix/broken design