makes location dynamic, cleans up modal, pre-services