Responsiveness fixes, code style fixes.