- Delete helper to use partial view instead
- Improve generator