Bug Fixes clean up UI