#8 Minor bug fix on button