more tweaks on responsiveness