Final UI touches and optimizations