Finally fixed most URL's