Starting to remove items from layout
Conflict fix