add buttons, vertical whitespace and some clean up