Probably should break this apart.  But its massive
Merge pull request #26 from OC-Emberjs/update-layout

Change the layout