Tried to clean up the user options again to be more user friendly.