Revert "Revert "Basic Layout""

This reverts commit 68536a560917c8ef69187235b077855a6ed7eb8e.