Visual and structural changes to help complete upgrade of template to 2.2