Commented out large part of previous test layout and added the basic structure for the new layout.