Layout and services adjustments