media-querie improved + more cleaning