Responsiveness tweaks