added modules, layout