more layout fixes for different media types