adding some changes for responsiveness and stuff
Merge remote-tracking branch 'origin/development'