Fixes #116 and #119

#119 - The button will properly honor states now when returning to that state.