Normalize the headers, add buttons for new and edit