added edit locations
merged locations into channel app