Fix missing cases in dynamic layout
In the current layout system there are some cases where there is not enough state stored to properly rewrite or revert UI changes.
In the current layout system there are some cases where there is not enough state stored to properly rewrite or revert UI changes.