Revert "Basic Layout"

This reverts commit 6564839a956f599dea22b6aa3927c2290422f394.