Changes to implement a floating figures for comment