continued work on layout, combined all partials into corresponding pages