More reponsive tweaks