Visual and layout fixes