Conversion layout, fixed some NPE's