Cleaned up service and made urls relative