UI Fixes and performance enhancement.