better figure markup