Fix responsiveness in client-side