Added User UI fix