UI and Bug Fixes

UI and Bug Fixes