Fix layout bug and also customer type is null bug