Add header and clean up URLS