Use better figure caption layout