More restructuring / playing with responsive