UI tweaks and optimizations