Make widgets persist across page refresh
Merge pull request #7163 from jdfreder/refresh-persist

Persist widgets across page refresh