switched layout structure
Merge pull request #3 from Dgrady3/filling-in-layout

RFR switched layout structure