UI Optimizations and Bug Fixes