improve and correct identity box display, also make it work with current 17.0a1 Night...