Settings page fix