Responsive CSS, merge fixes.