[#11] new layout 0.9