all done and ugly :)

Lines 12 & 13 should be grouped with their respective pages routes above, or those need to be regrouped by type as lines 12 & 13 are now.