Added button stats
Fixed merge commit.