eliminte duplication of wp assignment for userid 1  and first wp
Some minor changes to a few views, nothing major