refactored widget names to be a little shorter