Added in locate me button + code clean up