Fix responsiveness problems