Some visual changes
Resolve conflicts