tweaked navstate headers. thanks bohdohdan