Enhance manage page and URL Builder