- Re-organize widget panel options to better match output