Bug Fixes and Nav Changes