bug fixed & improvement for UI part