seems to be working with adjusted layout modules