UI Enhancement

Created by: ck_yeun9