Restructure layout. Move users to record. Fix unit test for Register
leanup and fix tests.
tart work on the save feature