Add a ScrollContext elements
Clean up output code a little