Revert "Completed basic layout"

This reverts commit bbe95b3677a8ff2d925159296bf2647d0fb1078d.