Merge fixes + layout fixes