Fix layout bug linux
Fix conflicts