Certificate display fixes