#219 Added explicit sorting during panel creation