This commit adds back changes from the commit 9142aec8ad Just updates the labels of some of the buttons
9142aec8ad