add cardlayout
merge