Modified layout for lambda-case