Working on responsiveness #173