diff --git a/content/FAQ/_index.md b/content/FAQ/_index.md
index f58b62675dc167f6324fd6f4d1231c5fa7b2804d..a130cf58ab3648ec387f8128b0711cb401f86973 100644
--- a/content/FAQ/_index.md
+++ b/content/FAQ/_index.md
@@ -25,7 +25,7 @@ operate it just like you would a personal machine.
Depending on your operating system, you may need to install software to
make this connection. Check out our documentation on [Connecting to HCC Clusters]
-({{< relref "/connecting/" >}}).
+({{< relref "../connecting/" >}}).
#### How do I change my password?
diff --git a/content/_index.md b/content/_index.md
index 29338843aaa9e52eeb6830bda7d8b86a0ece9513..a2e9676fecb2a0fac4b2d8845d6bf396c374b48a 100644
--- a/content/_index.md
+++ b/content/_index.md
@@ -7,7 +7,6 @@ weight = "1"
HCC Documentation
============================
-
The Holland Computing Center supports a diverse collection of research
computing hardware. Anyone in the University of Nebraska system is
welcome to apply for an account on HCC machines.
@@ -19,7 +18,15 @@ existing resource, acquiring 'priority access'. Finally, several
machines are available via Condor for opportunistic use. This will allow
users almost immediate access, but the job is subject to preemption.
-#### [New Users Sign Up](http://hcc.unl.edu/new-user-request)
+## Getting Started
+
+To begin using HCC resources:
+
+1. [Set up your HCC account]({{< relref "accounts/" >}})
+2. [Connect to HCC Clusters]({{< relref "connecting/" >}})
+3. [Transfer data to HCC Clusters]({{< relref "handling_data/" >}})
+4. [Check software availability]({{< relref "applications/" >}})
+5. [Submit jobs on HCC Clusters]({{< relref "submitting_jobs/" >}})
Which Cluster to Use?
---------------------
@@ -34,31 +41,6 @@ Rhino has 4 AMD Interlagos CPUs (64 cores) per node, with either 192GB or 256GB
node in the default partition. For extremely large RAM needs, there is also
a 'highmem' partition with 2 x 512GB and 2 x 1TB nodes.
-User Login
-----------
-
-For Windows users, please refer to this link [For Windows Users]({{< relref "for_windows_users" >}}).
-For Mac or Linux users, please refer to this link [For Mac/Linux Users]({{< relref "for_maclinux_users">}}).
-
-**Logging into Crane or Rhino**
-
-{{< highlight bash >}}
-ssh <username>@crane.unl.edu
-{{< /highlight >}}
-
-or
-
-{{< highlight bash >}}
-ssh <username>@rhino.unl.edu
-{{< /highlight >}}
-
-Duo Security
-------------
-
-Duo two-factor authentication is **required** for access to HCC
-resources. Registration and usage of Duo security can be found in this
-section: [Setting up and using Duo]({{< relref "/accounts/setting_up_and_using_duo">}})
-
**Important Notes**
- The Crane and Rhino clusters are separate. But, they are
diff --git a/content/applications/app_specific/fortran_c_on_hcc.md b/content/applications/app_specific/fortran_c_on_hcc.md
index fe50caef0215a97c5fa7943132a84edea8ab2613..3c41ebfc36f5be1d4428f2435e23c5da96971faa 100644
--- a/content/applications/app_specific/fortran_c_on_hcc.md
+++ b/content/applications/app_specific/fortran_c_on_hcc.md
@@ -10,7 +10,7 @@ downloaded from [serial_dir.zip](/attachments/serial_dir.zip).
#### Login to a HCC Cluster
-Connect to a HCC cluster]({{< relref "/connecting/" >}}) and make a subdirectory
+Connect to a HCC cluster]({{< relref "../../connecting/" >}}) and make a subdirectory
called `serial_dir` under your `$WORK` directory.
{{< highlight bash >}}
diff --git a/content/applications/app_specific/mpi_jobs_on_hcc.md b/content/applications/app_specific/mpi_jobs_on_hcc.md
index bee11f0562eb65ce8c7f359e2a594c63de6dfd24..182012219d5f3e665d097ba3f366238114c06878 100644
--- a/content/applications/app_specific/mpi_jobs_on_hcc.md
+++ b/content/applications/app_specific/mpi_jobs_on_hcc.md
@@ -10,7 +10,7 @@ scripts can be downloaded from [mpi_dir.zip](/attachments/mpi_dir.zip).
#### Login to a HCC Cluster
-Connect to a HCC cluster]({{< relref "/connecting/" >}}) and make a subdirectory
+Connect to a HCC cluster]({{< relref "../../connecting/" >}}) and make a subdirectory
and make a subdirectory called `mpi_dir` under your `$WORK` directory.
{{< highlight bash >}}
diff --git a/content/connecting/mobaxterm.md b/content/connecting/mobaxterm.md
index c3c9cac5bce87a158d8cdedf451203a317401f33..0bed8e41c98cc7d63795b7bc009d6c5adfb36c0d 100644
--- a/content/connecting/mobaxterm.md
+++ b/content/connecting/mobaxterm.md
@@ -1,6 +1,6 @@
+++
-title = "Using MobaXterm"
-description = "Quickstart Guide for MobaXterm"
+title = "Connecting with MobaXterm"
+description = "Connecting to and Transfering files between HCC Clusters with MobaXterm"
weight = "22"
+++
diff --git a/content/connecting/putty.md b/content/connecting/putty.md
index d804a373d5cf0498e8c61e3103c3ef7eeaa81426..966c8013dba310ba44eadfbae5041fa3826af334 100644
--- a/content/connecting/putty.md
+++ b/content/connecting/putty.md
@@ -1,5 +1,5 @@
+++
-title = "Using PuTTY"
+title = "Connecting with PuTTY (Windows)"
description = "How to connect to HCC clusters using the PuTTY SSH client"
weight = "20"
+++
diff --git a/content/connecting/terminal.md b/content/connecting/terminal.md
index 1f4459ba4b668b7695506f684822ac93b6887034..9951e798371291d9c93f1eb91a79057a666d8303 100644
--- a/content/connecting/terminal.md
+++ b/content/connecting/terminal.md
@@ -1,7 +1,7 @@
+++
title = "Connecting with Terminal"
description = "How to connect to HCC clusters using Terminal (Mac/Linux) or Command Prompt (Windows)"
-weight = "22"
+weight = "10"
+++
##### Use of Duo two-factor authentication is **required** to access HCC resources.
diff --git a/content/handling_data/data_transfer/connect_to_cb3_irods.md b/content/handling_data/data_transfer/connect_to_cb3_irods.md
index c123dd62309960df2f6ffa1a3c4c59b9fb2258e3..1431f6874bf323a3614f8504a98d387d76a3830a 100644
--- a/content/handling_data/data_transfer/connect_to_cb3_irods.md
+++ b/content/handling_data/data_transfer/connect_to_cb3_irods.md
@@ -1,7 +1,7 @@
+++
title = "Connecting to CB3 iRODS"
description= "How to connect to the CB3 iRODS instance."
-weight = 40
+weight = 70
+++
{{% panel theme="danger" header="Sensitive and Protected Data" %}}
diff --git a/content/handling_data/data_transfer/cyberduck.md b/content/handling_data/data_transfer/cyberduck.md
index 25bf0c83a9eb44cadc2215f7fd588b887c861cd5..0770749b75b215a9c1a847b156db6e3f4621e4bb 100644
--- a/content/handling_data/data_transfer/cyberduck.md
+++ b/content/handling_data/data_transfer/cyberduck.md
@@ -1,7 +1,7 @@
+++
-title = "File Transfer with CyberDuck (MacOS/Windows)"
+title = "File Transfer with CyberDuck"
description = "Transfering data to and from HCC clusters with the Cyberduck SCP Client"
-weight = "22"
+weight = "30"
+++
---
diff --git a/content/handling_data/data_transfer/globus_connect/_index.md b/content/handling_data/data_transfer/globus_connect/_index.md
index 61830c406dd9477414c72525536790a8c01ead65..8191bd1b3d37ca1ec8bdfef03f8047134e8e6887 100644
--- a/content/handling_data/data_transfer/globus_connect/_index.md
+++ b/content/handling_data/data_transfer/globus_connect/_index.md
@@ -1,7 +1,7 @@
+++
title = "Globus Connect"
description = "Globus Connect overview"
-weight = 20
+weight = 5
+++
<a href="https://www.globus.org/globus-connect" class="external-link">Globus Connect</a> is
diff --git a/content/handling_data/data_transfer/high_speed_data_transfers.md b/content/handling_data/data_transfer/high_speed_data_transfers.md
index 922eb4b43902030f7a09eeb1f96332fea2bbe294..07c5161af93d2b4d07b1538e37105dc6b7cd9465 100644
--- a/content/handling_data/data_transfer/high_speed_data_transfers.md
+++ b/content/handling_data/data_transfer/high_speed_data_transfers.md
@@ -1,7 +1,7 @@
+++
title = "High Speed Data Transfers"
description = "How to transfer files directly from the transfer servers"
-weight = 10
+weight = 40
+++
Crane, Rhino, and Attic each have a dedicated transfer server with
diff --git a/content/handling_data/data_transfer/scp.md b/content/handling_data/data_transfer/scp.md
index ab6c763633ccafdb49b29816f4bcb20e2c66600b..f69d8cabb886eeeea714c693594a5451264e8861 100644
--- a/content/handling_data/data_transfer/scp.md
+++ b/content/handling_data/data_transfer/scp.md
@@ -1,7 +1,7 @@
+++
title = "File Transfer with scp"
description = "Transfering data to and from HCC clusters with the scp command"
-weight = "22"
+weight = "10"
+++
## Using the SCP command
diff --git a/content/handling_data/data_transfer/using_rclone_with_hcc.md b/content/handling_data/data_transfer/using_rclone_with_hcc.md
index 02fc1c2617c7fba88dcd5772a5ec622bc5fab1ee..a81a0899f0166eae262fefed978cee24d099d60e 100644
--- a/content/handling_data/data_transfer/using_rclone_with_hcc.md
+++ b/content/handling_data/data_transfer/using_rclone_with_hcc.md
@@ -1,7 +1,7 @@
+++
title = "Using Rclone for File Transfer"
description = "How to use Rclone with HCC"
-weight =30
+weight =60
+++
Rclone is an open source file transfer tool to make transfering files to and from various cloud resources such as Box, Amazon S3, Microsoft OneDrive, and Google Cloud Storage and your local machine a simpler task. Guides on how to set up a variety of resources to transfer to and from can be found at [rclone's webpage](https://rclone.org/).
diff --git a/content/handling_data/data_transfer/winscp.md b/content/handling_data/data_transfer/winscp.md
index cd8949399e861e5ad079efffbe706b4da8782430..317dd8245849b378dcf78bf9ee5c9578fe253b3c 100644
--- a/content/handling_data/data_transfer/winscp.md
+++ b/content/handling_data/data_transfer/winscp.md
@@ -1,6 +1,6 @@
+++
-title = "For Windows Users"
-description = "Quickstart for Windows Users"
+title = "File Transfer with WinSCP"
+description = "Transfering Files to and from HCC Clusters using the WinSCP Client"
weight = "20"
+++