Made various tweaks to responsiveness