fixed formatting and buttons