production updates plus refactoring for layout, edit registration, and controller cleanup.