GUI improvements; CleanUpJob now works fine