WIP - Layout with reorderer component