Restructured CSS to put like elements w like elements