Updated with latest layout

Updates with latest changes in layout.