Refactor helpers to partial views
Refactor helpers to partial views