adapted button-types and spacing