Cleaup XML, add URL highlighting