merging changes
merging changes
some responsive design changes