VP-109 Refactored to component container template
VP-109 Minor clean-up
Merge pull request #29 from dlu-gs/feature/layout-logical-contents

Feature/layout logical contents