Bugfix layout call