Refactor code and enlarge cards