Done some stuff on responsiveness