added back responsive changes
Merge commit