A little cleanup on caret and panel