Fixed the button issue, in a kludgy way