Improve all layouts and others changes
Resolve conflicts