merge with basic layout2