Refactor table order
Invert screen order