Update version numbers again
Navigation reorganization and cleanup