Keyword: Code migration

Major

Better modularization in the layout configuration