Changed Layouts in Attempt to Fix Build Error