UI ALMOST FIX