Move style to external file; Rearrange table