Fix some issues with responsiveness