Fixed dropdown location after pickup.

Also Labeled variables to make it easier to read.
Fixes #460.