Bug fixes related to new navigation