Moved index and nav check into callback
Updated to latest build