Shawn-3103 UI improvement