LILY-220: improved layout