New header design. Improved main view file structure
Merge branch 'master' of https://github.com/justm/magnoliaMackovia