Page management - small rewrite to handle widgets with big data