bug fixes
UI Cleanup