bugfix in layout