Add button support (Closes #6)