header class and cleanup
layout fixes
Merge pull request #12 from ci-eric/layout-emulation

Layout emulation