some changes with sub+plugins
layouts