Reorganized the page a bit.