responsive v1
responsive v2
fixed responsive v2
fixing some conflicts