fixed full width scroll issue
merge with recent changes