Fixes to user framework.

Fixing current pages to reflect the new user framework.