Responsiveness fixes and container fixes