Button

 - Minor consistency updates and a wee regression bug fix