changed text format and button shapes