More work on cleaning up the button interactions.