Update UI : FIX by LimeOn