Enhance card app. Fix some small things.