Beacon Map - Simple drag & drop - Methods cleaned