Fixed minor issue with the wrong text being called for buttons