Refactoring. Card layout removed