UI Fixes and Performance updates