Simplifying View helpers + bugfix