Merge changes for responsive design by @aragonc