Merge "Fixed the textalignment for buttons"