Layout tweaks
Conflict Merge