Worker and UI improvements