Made multiple UI enhancement