added todo, fixed label width