Fixing some media queries + layout