Restructured a few parts of the page