Minor UI optimizations and tweaks