Fixed the Layout files. Yikes... #2