Responsive tweaks

Please read the commit notes for detailed information.