UI Fixes and Bug Fixes