More bugfixes for responsive layout