Improve responsive v1