First controller update
Merge pull request #360 from mmoreram/feature/page-component

First controller update