Button Bug Hunting

Nailed an annoying bug. closes issue #19