Final layout 2

Final layout 2