fix formatting and buttons