fixed Identity card display
some cleanup and renaming