Rearrange test UI
Add editable headers