Cleanup and UI/workflow fixes