Some Fix up + More UI