2nd Layout

Updates