Location Service improvements in both fragments