layout is improved