Updated with revisions to single-page-boilerplate