modified layout for support of subs and addons