Logic moved from Page show view to helper