Layout and structural fixes