[Layout]: closed jaws-project/jaws#130