Refine UI, split two part of them