UI Issue fixed