Adjust fingerprint layouts

This groups the fingerprint into a rectangle of 5x2 chunks again and puts it on the right in key list entry to make comparison easier.