(fix) improves drag and snap, adds shield image