Made a few cosmetic changes to improve the layout and appearance of the page
Added a few changes to how things are referred to for simplicity
Made a few changes to update to match the new design
Revert "Made a few changes to update to match the new design"

This reverts commit 95d6db2bc8f119695a03aabe5f4fb4e11a94f813.