Fix responsiveness issues