Improve contractors list's  appearance. Fix some bugs