Added locations and fixed client-side routing