Major Visual and routing changes