bugfix layout