Major project refactor
Merge branch 'refactor-layout' of github.com:michaelmarconi/oncue into refactor-layout