Moved some stuff around to clean up phone settings...