code review + refactoring of card layout