Fixed layout and filter out sub-modules
Oppdatert layout