Settings panel, code updates for Issue #27