Updated some of the structure as layout.
Userprefs didn't push