Continuing rework - completing Settings page