Responsive fixes first pass