text on buttons centered; code cleaning