Bob: modify structure , add media query