Responsive fixes
Completing merge