fix UI part 3