removed responsive design
merge