Improve a little comment container design