Fixing responsiveness issues