Final Fix for UI