UI Issue Bug Fixing.