Refact UI