Save the layout to preferences whenever a change is made.
Lock down the object further
More code cleaning