Fixed references and load order to display table.
Resolving merge conflict.