Merge "Polish changes for work tab" into sc-dev