More code review for UI job