Rebased

Replaced controllers with view_helpers.