Pindropping working from the toolbar
Clean up