DDBEASY-177 - Some responsive improovements.
Merge branch 'DDBEASY-177' into development