Bug fix and card view