Add panel options, clean up fields list