Layouts integration

Problem/Motivation

Make it possible to use layouts for the grouping of fields

Remaining tasks

Make sure the proposed patch is working and try to minimize the dependencies list