Fix colspan and add edit btns.