Final updates for accordion changes and labels