Reogranize styles, and add delete button to a button group