Fixed some responsiveness
Merge branch 'feature/better_responsiveness' into develop