bugfix common/layout