Fixed Issue where nav buttons would be incorrectly disabled or enabled.