refactored widget labels