Bug fix
Adjust media queries