Minor UI fix/enhancement