Update navigation to support UI changes