Settings page rework