UI Issue Fixed