Responsive update and bug fix