Adapted pages to new layout
Merge pull request #65 from lk108/master

Adapted pages to new layout