ui issue fix