Add panel in a more automated way. Also at the 'Assignment' page