Some more responsive tweaks