Feature/cardstack layout

some changes to cardstack