Enhancement: Rearrange columns