Fix up Nav UI