Continuing to tweak organization; added spacing section