CON-1790 Better styling for figure elements, fix floated-right images