Get change card view working fix #34