Fixed some responsiveness