Fix for UI bug

Here's the fix for the UI bug. Let me know if everything is fine