CON-1016

*DO NOT MERGE*
Do we really need ```display:table```?