Improve layout v_1.1