Update with layout feedback
Add media queries