settings page fix and cleanup