Fixing some responsiveness