'active plan' styling
Merge branch 'master' into 7.x-4.22
fix menu issues