Converted to use View Partials