Tim's changes to panel