UI and Bug Fixes