Fixed header tags
Further work on modules module