LAYOUT: 1st round of changes to get rid of overlapping areas