Some improvements to style. /shopping/... links not resolved
Merge