Fixed Layout Structure

Layout fixes.