Tidying up
1. We had left BASE_URL around in a few places, and not updated to the new url logic for everywhere.
2. All instances of BASE_URL should be replaced with reverse lookups in a future commit.