Various bugfixes for responsivity