Added spinner to view when WP list is loaded
Fixed merge conflicts