URL Fixes pt 2

URL Fixes pt 2