Small bug in layout, Martino to-do