integrated ui optimizations & fixes