...
Some media queries added, not final