Improced layout for modules
Merge pull request #234 from p2pu/refactor

Refactor layout for content