merge changes for responsive fix