small links & labels fixes
More fixes and ordering