Add base URL
Fix URLs