few UI fix