Reworked responsiveness a little