Gear dropdown fixes

In response to issues #27 and #26.