Bugfix layout