UI Update and optimizations