Refactored shift display table a bit