[TASK] Fixing responsiveness