layout bugfix