took out media queries
took out push and pull