Responsive fixes
Responsive fixes
Completing merge