performance tuning and UI tweaks