nav fixup
reorganize overrides and fix checkout
checkout js remove