Layout  bugfix