Feature/page guide

Merge feature/page-guide into develop