updated for settings page

cleaned up so its easier going forward