Button click fix

Fixed the issue of button clicks not working. Seems that all xml code
was duplicated in the same file.