organizational adjustments as well as adding layout customizations