Finished Saving favorites and adding location logic