Coef fix, small layput fixes
Conflict merge