Fixed picking, added dialog