#27 Layout adjustments