Add button and link button
Merge branch 'release/v0.0.2'