Refactors static pages layout
Makes method syntax explicit
Merge branch 'sample_app'