Fix alignment.
Move software to a "software" page.