Modified pages views and controller