weight category values fixed, helper view extends all views, text tweaks
fixed merge conflict