Refactor/rearrange preview table fields