Merging adding-button-functions branch