more base-url fixes in the layout