Further Setup Panel Refinements