Few more responsive improvements