Moved everything relevent to settings