Cleanup formatting and add back delete button code.