Layout improvements
Fixed conflicts