Made changes to location loading & css