fix scroll issue
fix wrapup styling
Merge pull request #794 from nidzix/master

Sf internal theme update