Updated New Layout

Fixed Layout and many minor issues fixed