Feature/25b

Completing option panels as part of the work in #25