Fixing location and settings bug