fixed width buttons, code cleanup