Fixed layout-bug