Small refactor of layout namespace
tmp inline