Fix Navigation Tables