fixed clear layer bug, added device location