Show real card name on view
and minor bugs fixes