Responsive tweaks

Please read the commit notes for detailed information.

fixes #2460 
fixes some problems (probably needs testing) mentioned by @illori