Code refactor to use atomic number than index location and update page linkes