New implementation on pages controller
Merge branch 'new_feature_heberti'