Adjusting layout to accomodate additional site type
Conflict resolution