More Responsiveness Tweaks