Responsive changes
merge fixes