Refactor InfoBox
issue