Fixing some responsiveness bugs