Update to WP adding view
Fixed merge conflicts