Fixed merge, updated view functions