[Declaration] improve layout