User Interface Improvements and Bug Fixes