Some fixes on layout

Solve some merge problems