Adjustments to content layouts...
Resolving conflicts...