Feature/view

Added helpers.
Clean up.