Clean up command navigation in UI.