Bugfix: Fix layout on frame change