Fixed merge, updated view functions
Updated Helper