completely integrated the settings page and dashboard