Refine the UI