[UI] FIx UI