Layout improve