Minor tweaks for responsiveness