user settings page working now
resolving merge